Merge "Fix definining of ANDROID_SMP." (bcf093bf) · Commits · e / os / android_frameworks_av

media/libmedia/Android.mk

+14 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,18 @@ LOCAL_SRC_FILES:= \
		LOCAL_SRC_FILES += ../libnbaio/roundup.c

		# for <cutils/atomic-inline.h>
		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 \