diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 20:26:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 20:26:18 +0000 |
| commit | 98c58699f903e9822b3cb37d53e92bc41c3ba771 (patch) | |
| tree | b65681c59453c797fd98ae7a77c304bbbbcf7106 | |
| parent | b06dc4a42e4628dc197490eb474a407c460008f9 (diff) | |
| parent | ba96de5f65101e8aa04f36c028551dcf08211eae (diff) | |
| download | system_core-98c58699f903e9822b3cb37d53e92bc41c3ba771.zip system_core-98c58699f903e9822b3cb37d53e92bc41c3ba771.tar.gz system_core-98c58699f903e9822b3cb37d53e92bc41c3ba771.tar.bz2 | |
am ba96de5f: am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."
* commit 'ba96de5f65101e8aa04f36c028551dcf08211eae':
Remove the error-prone TARGET_CPU_SMP from system/core.
| -rw-r--r-- | include/cutils/aref.h | 4 | ||||
| -rw-r--r-- | include/cutils/trace.h | 4 | ||||
| -rw-r--r-- | libcutils/Android.mk | 12 |
3 files changed, 2 insertions, 18 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 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 @@ endif 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_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 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 @@ LOCAL_MODULE := libcutils # 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) |