| commit | b77d62bd5224ef25c5e53f434db13eaacfa5024a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 12 14:30:38 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Aug 12 14:30:38 2015 -0700 |
| tree | d86691ad5e2c16581e628993a4b1a48b90bceb81 | |
| parent | b522187e21c62c4ad29ab0c3d9c534e6b0c7c301 [diff] |
Lose HAVE_ANDROID_OS in goldfish. Change-Id: Id626aee8d65e0ded543ac12416c37f938d196676
diff --git a/opengl/shared/OpenglCodecCommon/ErrorLog.h b/opengl/shared/OpenglCodecCommon/ErrorLog.h index 6f41fd7..d2388e6 100644 --- a/opengl/shared/OpenglCodecCommon/ErrorLog.h +++ b/opengl/shared/OpenglCodecCommon/ErrorLog.h
@@ -16,7 +16,7 @@ #ifndef _ERROR_LOG_H_ #define _ERROR_LOG_H_ -#if (HAVE_ANDROID_OS == 1) +#if defined(__ANDROID__) # include <cutils/log.h> # define ERR(...) ALOGE(__VA_ARGS__) # ifdef EMUGL_DEBUG
diff --git a/opengl/system/OpenglSystemCommon/ThreadInfo.h b/opengl/system/OpenglSystemCommon/ThreadInfo.h index f59ce2a..9a5dc88 100644 --- a/opengl/system/OpenglSystemCommon/ThreadInfo.h +++ b/opengl/system/OpenglSystemCommon/ThreadInfo.h
@@ -18,7 +18,7 @@ #include "HostConnection.h" #include <pthread.h> -#ifdef HAVE_ANDROID_OS +#ifdef __ANDROID__ #include <bionic_tls.h> #endif @@ -36,7 +36,7 @@ EGLThreadInfo *slow_getEGLThreadInfo(); -#ifdef HAVE_ANDROID_OS +#ifdef __ANDROID__ // We have a dedicated TLS slot in bionic inline EGLThreadInfo* getEGLThreadInfo() { EGLThreadInfo *tInfo =