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

Commit 7723c94d authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "Use Tremor for sim-eng, and Tremolo for other targets."

parents 67c12cc2 2c510140

media/libmediaplayerservice/Android.mk

+9 −1
Original line number Diff line number Diff line
@@ -54,12 +54,20 @@ ifneq ($(TARGET_SIMULATOR),true) 
LOCAL_SHARED_LIBRARIES += libdl

endif



LOCAL_C_INCLUDES := external/tremor/Tremor                              \

LOCAL_C_INCLUDES :=                                                     \

	$(JNI_H_INCLUDE)                                                \

	$(call include-path-for, graphics corecg)                       \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \

	$(TOP)/frameworks/base/media/libstagefright/include



ifeq ($(TARGET_ARCH),arm)

    LOCAL_C_INCLUDES += \

        $(TOP)/external/tremolo/Tremolo

else

    LOCAL_C_INCLUDES += \

        $(TOP)/external/tremor/Tremor

endif



LOCAL_MODULE:= libmediaplayerservice



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/Android.mk

+8 −1
Original line number Diff line number Diff line
@@ -48,8 +48,15 @@ endif 
LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \

        $(TOP)/external/opencore/android \

        $(TOP)/external/opencore/android



ifeq ($(TARGET_ARCH),arm)

    LOCAL_C_INCLUDES += \

        $(TOP)/external/tremolo/Tremolo

else

    LOCAL_C_INCLUDES += \

        $(TOP)/external/tremor/Tremor

endif



LOCAL_SHARED_LIBRARIES := \

        libbinder         \