Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gloria Wang
2010-02-05 19:06:38 -08:00
committed by Android (Google) Code Review
parent 496388cbdb 96827283df
commit 6b31e4d21f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libmediaplayerservice/Android.mk
View File

@@ -54,7 +54,7 @@ ifneq ($(TARGET_SIMULATOR),true)
LOCAL_SHARED_LIBRARIES += libdl
endif
LOCAL_C_INCLUDES := external/tremolo/Tremolo \
LOCAL_C_INCLUDES := external/tremor/Tremor \
$(JNI_H_INCLUDE) \
$(call include-path-for, graphics corecg) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \

2
media/libstagefright/Android.mk
View File

@@ -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/tremolo/Tremolo
$(TOP)/external/tremor/Tremor
LOCAL_SHARED_LIBRARIES := \
libbinder \