diff options
| author | Gloria Wang <gwang@google.com> | 2010-02-12 17:04:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-12 17:04:29 -0800 |
| commit | 190dd57fb843b1b5019ebdba32e44617c6bbc3d0 (patch) | |
| tree | b90a1e3828acfd44b6264d80f63f573986b4cf67 | |
| parent | cf36010357b0e106e600c953437e6375b3e65fcb (diff) | |
| parent | 8d00b53cc408a7fce541fa076a55c9b7239ce590 (diff) | |
| download | frameworks_base-190dd57fb843b1b5019ebdba32e44617c6bbc3d0.zip frameworks_base-190dd57fb843b1b5019ebdba32e44617c6bbc3d0.tar.gz frameworks_base-190dd57fb843b1b5019ebdba32e44617c6bbc3d0.tar.bz2 | |
Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 9 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index a9a0fde..cf97b23 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -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 diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 1db398e..071bb9e 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -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 \ |