commit 5c97c4e1b0a45e52f463eeef37cd672372644613
author Narayan Kamath <narayan@google.com> Mon Jan 05 16:31:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 05 16:31:41 2015 +0000
tree cfa2e0972421d2f75b3365d29d6745a2172afd15
parent bd08223c450a7a2e8e8d79e6be148ed1ac64caa3
parent f84f7c527427b521fd833210c23008ae3a7c09b8

Merge "Remove hardcoded ICU & OpenSSL include paths."

media/libmedia/Android.mk

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 @@
     $(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)
 

media/libstagefright/Android.mk

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