From e9ca709a7381e72b7216c7b08e37d9fe2a205921 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 17 Nov 2014 11:16:59 -0800
Subject: 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
---
 include/cutils/aref.h  | 4 ----
 include/cutils/trace.h | 4 ----
 2 files changed, 8 deletions(-)

(limited to 'include')

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
 
-- 
cgit v1.1