diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 18:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:25:14 -0700 |
| commit | 06fa2bcce5dd80b406a23f980d8c9fac1524ebfd (patch) | |
| tree | 340fd639cd8c487e65c47e4d44ee66974d8a9b85 /media/libmedia | |
| parent | 30550ba7a19372daa7424710ca1367bb7299e459 (diff) | |
| parent | 56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627 (diff) | |
| download | frameworks_av-06fa2bcce5dd80b406a23f980d8c9fac1524ebfd.zip frameworks_av-06fa2bcce5dd80b406a23f980d8c9fac1524ebfd.tar.gz frameworks_av-06fa2bcce5dd80b406a23f980d8c9fac1524ebfd.tar.bz2 | |
am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp
* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Diffstat (limited to 'media/libmedia')
| -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 b4d01f5..2e5cbe3 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -50,7 +50,7 @@ endif LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ - $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ + $(TOP)/frameworks/base/include/media/stagefright/openmax \ external/icu4c/common \ external/expat/lib |