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

Merge "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-12 17:04:29 -08:00
committed by Android (Google) Code Review
parent cf36010357 8d00b53cc4
commit 190dd57fb8
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/libmediaplayerservice/Android.mk
View File

@@ -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

9
media/libstagefright/Android.mk
View File

@@ -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 \