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

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

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

Merge "Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)""
parents 496388cb 96827283

media/libmediaplayerservice/Android.mk

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

LOCAL_SHARED_LIBRARIES += libdl

endif

endif





LOCAL_C_INCLUDES := external/tremolo/Tremolo                            \

LOCAL_C_INCLUDES := external/tremor/Tremor                              \

	$(JNI_H_INCLUDE)                                                \

	$(JNI_H_INCLUDE)                                                \

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

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

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

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

media/libstagefright/Android.mk

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

	$(JNI_H_INCLUDE) \

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

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

        $(TOP)/external/opencore/android \

        $(TOP)/external/opencore/android \

        $(TOP)/external/tremolo/Tremolo

        $(TOP)/external/tremor/Tremor





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

        libbinder         \

        libbinder         \