diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-09 23:55:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-09 14:45:53 +0000 |
| commit | 0bffd2e60f644c8b8650c48d320c8cc22deb8ab6 (patch) | |
| tree | 5546ec24a860eaccd3165e2b7058ba073ca21556 /media | |
| parent | c37eaa320437b7d65d1c3f704d7b7c61d4ccd8f1 (diff) | |
| parent | 51bc26144ca9c3872e41f9864622170d528be1b0 (diff) | |
| download | frameworks_av-0bffd2e60f644c8b8650c48d320c8cc22deb8ab6.zip frameworks_av-0bffd2e60f644c8b8650c48d320c8cc22deb8ab6.tar.gz frameworks_av-0bffd2e60f644c8b8650c48d320c8cc22deb8ab6.tar.bz2 | |
Merge "Switch frameworks/av/media/libmedia to the new icu."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 56e7787..1e322f9 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -76,7 +76,7 @@ LOCAL_MODULE:= libmedia LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ $(TOP)/frameworks/native/include/media/openmax \ - external/icu4c/common \ + external/icu/icu4c/source/common \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) |