commit ba96de5f65101e8aa04f36c028551dcf08211eae
author Elliott Hughes <enh@google.com> Mon Nov 17 19:40:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 17 19:40:16 2014 +0000
tree e6fec479b8c078aad3ca7bee51a75e9122cae3a7
parent 33aacf1963dd1914c0ff94c4ddd05f729cdba3b6
parent 3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669

am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."

* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
  Remove the error-prone TARGET_CPU_SMP from system/core.

include/cutils/aref.h

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
 

include/cutils/trace.h

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
 

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 6987e9c..7202704 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -16,13 +16,6 @@
 LOCAL_PATH := $(my-dir)
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_CPU_SMP),true)
-    targetSmpFlag := -DANDROID_SMP=1
-else
-    targetSmpFlag := -DANDROID_SMP=0
-endif
-hostSmpFlag := -DANDROID_SMP=0
-
 commonSources := \
 	hashmap.c \
 	atomic.c.arm \
@@ -77,7 +70,6 @@
 LOCAL_MODULE := libcutils
 LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
 LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_CFLAGS += $(hostSmpFlag)
 ifneq ($(HOST_OS),windows)
 LOCAL_CFLAGS += -Werror
 endif
@@ -154,7 +146,7 @@
 
 LOCAL_C_INCLUDES := $(libcutils_c_includes)
 LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_CFLAGS += $(targetSmpFlag) -Werror -std=gnu90
+LOCAL_CFLAGS += -Werror -std=gnu90
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_LIBRARY)
 
@@ -164,7 +156,7 @@
 # liblog symbols present in libcutils.
 LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog
 LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_CFLAGS += $(targetSmpFlag) -Werror
+LOCAL_CFLAGS += -Werror
 LOCAL_C_INCLUDES := $(libcutils_c_includes)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_SHARED_LIBRARY)