From 2be7786b9847861862c60eaf85c610823fdf2da9 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 6 Nov 2014 13:27:43 -0800 Subject: Fix definining of ANDROID_SMP. If TARGET_CPU_SMP is undefined, such as in SDK builds, then the condition as written before could cause SMP memory barriers to be missing. Also, add a dependency for Android.mk so that changes to it cause recompilation. Change-Id: I63ac0dc4342a39b9355fce2b2200016244cffc4a --- media/libmedia/Android.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'media/libmedia/Android.mk') diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 1e322f9..4dc97e1 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -59,7 +59,18 @@ LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES += ../libnbaio/roundup.c # for -LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0) +ifeq ($(TARGET_CPU_SMP),true) + LOCAL_CFLAGS += -DANDROID_SMP=1 +else + ifeq ($(TARGET_CPU_SMP),false) + LOCAL_CFLAGS += -DANDROID_SMP=0 + else + $(warning TARGET_CPU_SMP should be (true|false), found $(TARGET_CPU_SMP)) + # Make sure we emit barriers for the worst case. + LOCAL_CFLAGS += -DANDROID_SMP=1 + endif +endif + LOCAL_SRC_FILES += SingleStateQueue.cpp LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"' # Consider a separate a library for SingleStateQueueInstantiations. @@ -73,6 +84,8 @@ LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper LOCAL_MODULE:= libmedia +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ $(TOP)/frameworks/native/include/media/openmax \ -- cgit v1.1