summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/libmediaplayerservice/Android.mk9
-rw-r--r--media/libstagefright/Android.mk9
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 \