Merge "Remove the error-prone TARGET_CPU_SMP from system/core." (3ef0460e) · Commits · e / os / android_system_core

include/cutils/aref.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

+2 −10

Original line number	Diff line number	Diff line
		@@ -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)