diff options
| author | Marco Nelissen <marcone@google.com> | 2014-09-04 00:15:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 00:15:45 +0000 |
| commit | 5ede45b5b776581969924ed9a13c36f41d33a032 (patch) | |
| tree | 19641cd071db35cfffd67cbd821b42bbc340f569 /media/libstagefright/Android.mk | |
| parent | 78394fe065d01c6aed51f4448811d0966ae82c59 (diff) | |
| parent | e866880ae1709062e0a8b36e62a78d91c3f06cc9 (diff) | |
| download | frameworks_av-5ede45b5b776581969924ed9a13c36f41d33a032.zip frameworks_av-5ede45b5b776581969924ed9a13c36f41d33a032.tar.gz frameworks_av-5ede45b5b776581969924ed9a13c36f41d33a032.tar.bz2 | |
am e866880a: am d71233a8: Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev
* commit 'e866880ae1709062e0a8b36e62a78d91c3f06cc9':
Use CharacterEncodingDetector in metadataretriever
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index a0d9b29..7c4f92a 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -62,6 +62,7 @@ LOCAL_SRC_FILES:= \ avc_utils.cpp \ LOCAL_C_INCLUDES:= \ + $(TOP)/frameworks/av/include/media/ \ $(TOP)/frameworks/av/include/media/stagefright/timedtext \ $(TOP)/frameworks/native/include/media/hardware \ $(TOP)/frameworks/native/include/media/openmax \ @@ -70,6 +71,8 @@ LOCAL_C_INCLUDES:= \ $(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 \ |