diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-18 08:33:38 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-18 08:33:38 -0700 |
| commit | 8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9 (patch) | |
| tree | 5ba561315eff765e4a434ae56c55c3648defe5ec /media/libmedia | |
| parent | 3e00cc070090fa3eab16792da90aa33823cd6db1 (diff) | |
| parent | 06fa2bcce5dd80b406a23f980d8c9fac1524ebfd (diff) | |
| download | frameworks_av-8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9.zip frameworks_av-8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9.tar.gz frameworks_av-8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9.tar.bz2 | |
Merge fb474872 from gingerbread-plus-aosp
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
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 |