Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be7786b authored by Ian Rogers's avatar Ian Rogers
Browse files

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
parent 686a0c4d

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 \