commit a83be75b8bc946ba3b50c2bd99a746f1cce801bc
author James Dong <jdong@google.com> Tue Jan 18 13:40:06 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 18 13:40:06 2011 -0800
tree cfbc2db87c2f16a86c9d7e808433ebbf4a42854c
parent ba7ac24e4d85cabbe803c7abf032aca2606ee6a4
parent 328af07ab9a47631dbf5455bfba2dd49e7dc2e31

Merge "Fix the build break in git_master-without-vendor"

media/jni/mediaeditor/Android.mk

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 @@
     $(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 \