Merge "Clean up use of HAVE_ANDROID_OS" (61bfd84d) · Commits · e / os / android_frameworks_native

libs/binder/MemoryHeapBase.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

libs/binder/MemoryHeapPmem.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -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);

libs/utils/SystemClock.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -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) {

libs/utils/Threads.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

opengl/libs/EGL/egl.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@

		#include <sys/ioctl.h>

		#if HAVE_ANDROID_OS
		#ifdef HAVE_ANDROID_OS
		#include <linux/android_pmem.h>
		#endif