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

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

Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor...

Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
parents cf360103 8d00b53c
Loading
Loading
Loading
Loading
+1 −8
Original line number Diff line number Diff line
@@ -59,15 +59,8 @@ 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)/frameworks/base/media/libstagefright/include             \
        $(TOP)/external/tremolo/Tremolo
else
    LOCAL_C_INCLUDES += \
        $(TOP)/external/tremor/Tremor
endif

LOCAL_MODULE:= libmediaplayerservice

+1 −8
Original line number Diff line number Diff line
@@ -48,15 +48,8 @@ endif
LOCAL_C_INCLUDES:= \
	$(JNI_H_INCLUDE) \
        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
        $(TOP)/external/opencore/android

ifeq ($(TARGET_ARCH),arm)
    LOCAL_C_INCLUDES += \
        $(TOP)/external/opencore/android \
        $(TOP)/external/tremolo/Tremolo
else
    LOCAL_C_INCLUDES += \
        $(TOP)/external/tremor/Tremor
endif

LOCAL_SHARED_LIBRARIES := \
        libbinder         \