diff options
| author | Marco Nelissen <marcone@google.com> | 2014-08-29 16:00:28 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-09-02 11:54:44 -0700 |
| commit | 34581f44cde67960fbac3ba1f191a2c063ea5145 (patch) | |
| tree | 9c89d859f2c9cd1c622355a767e3a7c57c658e8a /media/libmedia/Android.mk | |
| parent | 9dd4a2ddd7caf8cbe50d8a76e0ec3e0274d2bce6 (diff) | |
| download | frameworks_av-34581f44cde67960fbac3ba1f191a2c063ea5145.zip frameworks_av-34581f44cde67960fbac3ba1f191a2c063ea5145.tar.gz frameworks_av-34581f44cde67960fbac3ba1f191a2c063ea5145.tar.bz2 | |
Use CharacterEncodingDetector in metadataretriever
instead of media scanner. This way the java MediaMetadataRetriever API
will give the same result as the media scanner.
Also apply some tweaks to the encoding detector to improve handling of
ISO-8859-1 tags.
Bug: 16302581, 17205395
Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
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 3be0651..ffadb23 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) |