diff options
| author | James Dong <jdong@google.com> | 2011-01-18 13:26:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-18 13:26:14 -0800 |
| commit | 0a3dbf6f69a72d557afca69f006a407fbfc2482d (patch) | |
| tree | 00fc9d660424c3309f2714fe88961051fc3f01f3 /media/jni | |
| parent | 26c1ab2e58f47ac94e638f69b9b626cc6b1925b6 (diff) | |
| parent | a1a55bbe9480231095c0da28ae34804b663bc11f (diff) | |
| download | frameworks_base-0a3dbf6f69a72d557afca69f006a407fbfc2482d.zip frameworks_base-0a3dbf6f69a72d557afca69f006a407fbfc2482d.tar.gz frameworks_base-0a3dbf6f69a72d557afca69f006a407fbfc2482d.tar.bz2 | |
Merge "Fix the build break in git_master-without-vendor" into honeycomb
Diffstat (limited to 'media/jni')
| -rwxr-xr-x | media/jni/mediaeditor/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index 9d6e7d4..27c41be 100755 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -36,9 +36,7 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/base/media/libstagefright/rtsp \ $(JNI_H_INCLUDE) \ $(call include-path-for, corecg graphics) \ - $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ - $(TOP)/external/opencore/android \ - $(TOP)/vendor/qcom/proprietary/qdsp6/mm-core/omxcore/inc \ + $(TOP)/frameworks/base/include/media/stagefright/openmax \ $(TOP)/frameworks/base/core/jni/mediaeditor \ $(TOP)/frameworks/media/libvideoeditor/vss/inc \ $(TOP)/frameworks/media/libvideoeditor/vss/common/inc \ |