Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up use of HAVE_ANDROID_OS"

Browse Source
This commit is contained in:
Kenny Root
2011-02-16 12:33:28 -08:00
committed by Android (Google) Code Review
parent 8ec313e4fa bb9d394b21
commit ca20af0c29
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/binder/MemoryHeapBase.cpp
View File

@@ -31,7 +31,7 @@
#include <binder/MemoryHeapBase.h>
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
#include <linux/android_pmem.h>
#endif
@@ -108,7 +108,7 @@ status_t MemoryHeapBase::mapfd(int fd, size_t size, uint32_t offset)
{
if (size == 0) {
// try to figure out the size automatically
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
// first try the PMEM ioctl
pmem_region reg;
int err = ioctl(fd, PMEM_GET_TOTAL_SIZE, &reg);

12
libs/binder/MemoryHeapPmem.cpp
View File

@@ -30,7 +30,7 @@
#include <binder/MemoryHeapPmem.h>
#include <binder/MemoryHeapBase.h>
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
#include <linux/android_pmem.h>
#endif
@@ -72,7 +72,7 @@ SubRegionMemory::SubRegionMemory(const sp<MemoryHeapPmem>& heap,
memset(start_ptr, 0xda, size);
#endif
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
if (size > 0) {
const size_t pagesize = getpagesize();
size = (size + pagesize-1) & ~(pagesize-1);
@@ -107,7 +107,7 @@ void SubRegionMemory::revoke()
// which means MemoryHeapPmem::revoke() wouldn't have been able to
// promote() it.
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
if (mSize != 0) {
const sp<MemoryHeapPmem>& heap(getHeap());
int our_fd = heap->heapID();
@@ -130,7 +130,7 @@ MemoryHeapPmem::MemoryHeapPmem(const sp<MemoryHeapBase>& pmemHeap,
: MemoryHeapBase()
{
char const * const device = pmemHeap->getDevice();
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
if (device) {
int fd = open(device, O_RDWR | (flags & NO_CACHING ? O_SYNC : 0));
LOGE_IF(fd<0, "couldn't open %s (%s)", device, strerror(errno));
@@ -187,7 +187,7 @@ sp<MemoryHeapPmem::MemoryPmem> MemoryHeapPmem::createMemory(
status_t MemoryHeapPmem::slap()
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
size_t size = getSize();
const size_t pagesize = getpagesize();
size = (size + pagesize-1) & ~(pagesize-1);
@@ -205,7 +205,7 @@ status_t MemoryHeapPmem::slap()
status_t MemoryHeapPmem::unslap()
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
size_t size = getSize();
const size_t pagesize = getpagesize();
size = (size + pagesize-1) & ~(pagesize-1);

8
libs/utils/SystemClock.cpp
View File

@@ -19,7 +19,7 @@
* System clock functions.
*/
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
#include <linux/ioctl.h>
#include <linux/rtc.h>
#include <utils/Atomic.h>
@@ -50,7 +50,7 @@ int setCurrentTimeMillis(int64_t millis)
return -1;
#else
struct timeval tv;
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
struct timespec ts;
int fd;
int res;
@@ -66,7 +66,7 @@ int setCurrentTimeMillis(int64_t millis)
LOGD("Setting time of day to sec=%d\n", (int) tv.tv_sec);
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
fd = open("/dev/alarm", O_RDWR);
if(fd < 0) {
LOGW("Unable to open alarm driver: %s\n", strerror(errno));
@@ -106,7 +106,7 @@ int64_t uptimeMillis()
*/
int64_t elapsedRealtime()
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
static int s_fd = -1;
if (s_fd == -1) {

2
libs/utils/Threads.cpp
View File

@@ -739,7 +739,7 @@ int Thread::_threadLoop(void* user)
wp<Thread> weak(strong);
self->mHoldSelf.clear();
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
// this is very useful for debugging with gdb
self->mTid = gettid();
#endif

2
opengl/libs/EGL/egl.cpp
View File

@@ -22,7 +22,7 @@
#include <sys/ioctl.h>
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
#include <linux/android_pmem.h>
#endif

12
services/jni/com_android_server_AlarmManagerService.cpp
View File

@@ -33,7 +33,7 @@
#include <errno.h>
#include <unistd.h>
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
#include <linux/ioctl.h>
#include <linux/android_alarm.h>
#endif
@@ -42,7 +42,7 @@ namespace android {
static jint android_server_AlarmManagerService_setKernelTimezone(JNIEnv* env, jobject obj, jint fd, jint minswest)
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
struct timezone tz;
tz.tz_minuteswest = minswest;
@@ -64,7 +64,7 @@ static jint android_server_AlarmManagerService_setKernelTimezone(JNIEnv* env, jo
static jint android_server_AlarmManagerService_init(JNIEnv* env, jobject obj)
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
return open("/dev/alarm", O_RDWR);
#else
return -1;
@@ -73,14 +73,14 @@ static jint android_server_AlarmManagerService_init(JNIEnv* env, jobject obj)
static void android_server_AlarmManagerService_close(JNIEnv* env, jobject obj, jint fd)
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
close(fd);
#endif
}
static void android_server_AlarmManagerService_set(JNIEnv* env, jobject obj, jint fd, jint type, jlong seconds, jlong nanoseconds)
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
struct timespec ts;
ts.tv_sec = seconds;
ts.tv_nsec = nanoseconds;
@@ -95,7 +95,7 @@ static void android_server_AlarmManagerService_set(JNIEnv* env, jobject obj, jin
static jint android_server_AlarmManagerService_waitForAlarm(JNIEnv* env, jobject obj, jint fd)
{
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
int result = 0;
do

2
services/jni/com_android_server_BatteryService.cpp
View File

@@ -33,7 +33,7 @@
#include <unistd.h>
#include <dirent.h>
#if HAVE_ANDROID_OS
#ifdef HAVE_ANDROID_OS
#include <linux/ioctl.h>
#endif