diff options
| author | Marco Nelissen <marcone@google.com> | 2014-09-03 19:09:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 19:09:43 +0000 |
| commit | d71233a846aca7035a851941c1530d04c6a65086 (patch) | |
| tree | a1f528af0c52fd0d78a1843743f2930a2684f2b2 /media/libmedia/Android.mk | |
| parent | acdae5d7865b604acaadd3be1c45c84ca4bf3952 (diff) | |
| parent | 34581f44cde67960fbac3ba1f191a2c063ea5145 (diff) | |
| download | frameworks_av-d71233a846aca7035a851941c1530d04c6a65086.zip frameworks_av-d71233a846aca7035a851941c1530d04c6a65086.tar.gz frameworks_av-d71233a846aca7035a851941c1530d04c6a65086.tar.bz2 | |
Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev
Diffstat (limited to 'media/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 37bc418..e012116 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -76,9 +76,10 @@ LOCAL_MODULE:= libmedia LOCAL_C_INCLUDES := \ $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/frameworks/av/include/media/ \ $(TOP)/frameworks/av/media/libstagefright \ - external/icu/icu4c/source/common \ - external/icu/icu4c/source/i18n \ + $(TOP)/external/icu/icu4c/source/common \ + $(TOP)/external/icu/icu4c/source/i18n \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) |