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

Commit 75ed8142 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 c5d1c6db 2f46c062

media/libmediaplayerservice/Android.mk

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

endif



LOCAL_C_INCLUDES := external/tremor/Tremor                              \

LOCAL_C_INCLUDES := external/tremolo/Tremolo                            \

	$(JNI_H_INCLUDE)                                                \

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

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

media/libstagefright/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ LOCAL_C_INCLUDES:= \ 
	$(JNI_H_INCLUDE) \

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

        $(TOP)/external/opencore/android \

        $(TOP)/external/tremor/Tremor

        $(TOP)/external/tremolo/Tremolo



LOCAL_SHARED_LIBRARIES := \

        libbinder         \