summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-17 11:16:59 -0800
committerElliott Hughes <enh@google.com>2014-11-17 11:16:59 -0800
commite9ca709a7381e72b7216c7b08e37d9fe2a205921 (patch)
tree5f3c7ea537d0676581dc29d4a54c9e7085083b6b /include
parente11d81b37c119ec3d67c1fe60779d510d21e6a14 (diff)
downloadsystem_core-e9ca709a7381e72b7216c7b08e37d9fe2a205921.zip
system_core-e9ca709a7381e72b7216c7b08e37d9fe2a205921.tar.gz
system_core-e9ca709a7381e72b7216c7b08e37d9fe2a205921.tar.bz2
Remove the error-prone TARGET_CPU_SMP from system/core.
This means that code that uses libcutils no longer has to ensure that it's set ANDROID_SMP in the calling code's Android.mk for this to function correctly. Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
Diffstat (limited to 'include')
-rw-r--r--include/cutils/aref.h4
-rw-r--r--include/cutils/trace.h4
2 files changed, 0 insertions, 8 deletions
diff --git a/include/cutils/aref.h b/include/cutils/aref.h
index 460ac02..e40dc70 100644
--- a/include/cutils/aref.h
+++ b/include/cutils/aref.h
@@ -20,11 +20,7 @@
#include <stddef.h>
#include <sys/cdefs.h>
-#ifdef ANDROID_SMP
#include <cutils/atomic-inline.h>
-#else
-#include <cutils/atomic.h>
-#endif
__BEGIN_DECLS
diff --git a/include/cutils/trace.h b/include/cutils/trace.h
index c863afd..6ca8293 100644
--- a/include/cutils/trace.h
+++ b/include/cutils/trace.h
@@ -26,11 +26,7 @@
#include <unistd.h>
#include <cutils/compiler.h>
-#ifdef ANDROID_SMP
#include <cutils/atomic-inline.h>
-#else
-#include <cutils/atomic.h>
-#endif
__BEGIN_DECLS