diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-09 17:46:33 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-07-09 17:46:33 -0700 |
| commit | 01cab9ce4fb203fab8f5115ff866f9f0cc96a73a (patch) | |
| tree | 7ceb2156dc9f740d6e5274113b36755a5995e18e /media/libmedia/Android.mk | |
| parent | bc2fb720bbd0acd122bacc67e844e982d068f6f9 (diff) | |
| parent | 373e21cc119cede767dc93d75c91645dbf9ae19f (diff) | |
| download | frameworks_av-01cab9ce4fb203fab8f5115ff866f9f0cc96a73a.zip frameworks_av-01cab9ce4fb203fab8f5115ff866f9f0cc96a73a.tar.gz frameworks_av-01cab9ce4fb203fab8f5115ff866f9f0cc96a73a.tar.bz2 | |
resolved conflicts for merge of 373e21cc to master
Change-Id: I91afd8f9cba04559d21e1c84e25c5c60c990165d
Diffstat (limited to 'media/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 69eead3..cee26d9 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -74,8 +74,8 @@ LOCAL_MODULE:= libmedia LOCAL_C_INCLUDES := \ $(TOP)/frameworks/native/include/media/openmax \ - external/icu4c/common \ - external/icu4c/i18n \ + external/icu/icu4c/source/common \ + external/icu/icu4c/source/i18n \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) |