summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-05 11:41:09 +0000
committerNarayan Kamath <narayan@google.com>2015-01-05 16:29:14 +0000
commitf84f7c527427b521fd833210c23008ae3a7c09b8 (patch)
treecfa2e0972421d2f75b3365d29d6745a2172afd15
parentbd08223c450a7a2e8e8d79e6be148ed1ac64caa3 (diff)
downloadframeworks_av-f84f7c527427b521fd833210c23008ae3a7c09b8.zip
frameworks_av-f84f7c527427b521fd833210c23008ae3a7c09b8.tar.gz
frameworks_av-f84f7c527427b521fd833210c23008ae3a7c09b8.tar.bz2
Remove hardcoded ICU & OpenSSL include paths.
They're exported using LOCAL_EXPORT_C_INCLUDE_DIRS. bug: 18581021 Change-Id: I9593422b9eddb8203bee88d60e31a03b4a5f976b
-rw-r--r--media/libmedia/Android.mk2
-rw-r--r--media/libstagefright/Android.mk3
2 files changed, 0 insertions, 5 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index 50d9a0f..ac770f1 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -80,8 +80,6 @@ LOCAL_C_INCLUDES := \
$(TOP)/frameworks/native/include/media/openmax \
$(TOP)/frameworks/av/include/media/ \
$(TOP)/frameworks/av/media/libstagefright \
- $(TOP)/external/icu/icu4c/source/common \
- $(TOP)/external/icu/icu4c/source/i18n \
$(call include-path-for, audio-effects) \
$(call include-path-for, audio-utils)
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 193f8a7..7bfd2fb 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -68,11 +68,8 @@ LOCAL_C_INCLUDES:= \
$(TOP)/frameworks/native/include/media/openmax \
$(TOP)/external/flac/include \
$(TOP)/external/tremolo \
- $(TOP)/external/openssl/include \
$(TOP)/external/libvpx/libwebm \
$(TOP)/system/netd/include \
- $(TOP)/external/icu/icu4c/source/common \
- $(TOP)/external/icu/icu4c/source/i18n \
LOCAL_SHARED_LIBRARIES := \
libbinder \