commit 5e37175676a1089fc7c40ac8b705799dccabcc30
author Stephen Hines <srhines@google.com> Thu Aug 15 16:01:26 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 15 16:01:26 2013 -0700
tree 46bb7dbae3b87ea92b8653c4b35fdebdea8c0c95
parent ef7cb5ce9217c08eef64319a223474a8516dacf7
parent fd47ac29478ed01a581b3326d898ad848858a314

am fd47ac29: am 43cfc0cb: Remove barriers to using NDK v8 includes.

* commit 'fd47ac29478ed01a581b3326d898ad848858a314':
  Remove barriers to using NDK v8 includes.

cpu_ref/rsCpuRuntimeMath.cpp

diff --git a/cpu_ref/rsCpuRuntimeMath.cpp b/cpu_ref/rsCpuRuntimeMath.cpp
index c80111a..0aaadd4 100644
--- a/cpu_ref/rsCpuRuntimeMath.cpp
+++ b/cpu_ref/rsCpuRuntimeMath.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef RS_SERVER
+#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
 #include <cutils/compiler.h>
 #endif
 

rsCppUtils.h

diff --git a/rsCppUtils.h b/rsCppUtils.h
index 36b52aa..71cf077 100644
--- a/rsCppUtils.h
+++ b/rsCppUtils.h
@@ -151,7 +151,6 @@
     SYSTEM_TIME_MONOTONIC = 1, // monotonic time since unspecified starting point
     SYSTEM_TIME_PROCESS = 2,   // high-resolution per-process clock
     SYSTEM_TIME_THREAD = 3,    // high-resolution per-thread clock
-    SYSTEM_TIME_BOOTTIME = 4   // same as SYSTEM_TIME_MONOTONIC, but including CPU suspend time
 };
 
 static inline nsecs_t systemTime(int clock)
@@ -161,8 +160,7 @@
             CLOCK_REALTIME,
             CLOCK_MONOTONIC,
             CLOCK_PROCESS_CPUTIME_ID,
-            CLOCK_THREAD_CPUTIME_ID,
-            CLOCK_BOOTTIME
+            CLOCK_THREAD_CPUTIME_ID
     };
     struct timespec t;
     t.tv_sec = t.tv_nsec = 0;

rsSignal.cpp

diff --git a/rsSignal.cpp b/rsSignal.cpp
index c59b39e..658c0b7 100644
--- a/rsSignal.cpp
+++ b/rsSignal.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "rsSignal.h"
+#include <errno.h>
 
 using namespace android;
 using namespace android::renderscript;