Fix git_master-without-vendor build

Change-Id: Ia5944bd87ae788b070ff9e44b3428a303fb45ca5

diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk
index 51022bd..23550ce 100755 (executable)
--- a/libvideoeditor/lvpp/Android.mk
+++ b/libvideoeditor/lvpp/Android.mk
@@ -37,7 +37,7 @@ LOCAL_SRC_FILES:=          \
     VideoEditorBGAudioProcessing.cpp \\r
     PreviewRenderer.cpp\r
 \r
-LOCAL_MODULE_TAGS := development\r
+LOCAL_MODULE_TAGS := eng development\r
 \r
 LOCAL_STATIC_LIBRARIES := \\r
     libvideoeditor_osal \\r
@@ -68,9 +68,7 @@ LOCAL_C_INCLUDES += \
     $(TOP)/frameworks/base/media/libstagefright/rtsp \\r
     $(JNI_H_INCLUDE) \\r
     $(call include-path-for, corecg graphics) \\r
-    $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \\r
-    $(TOP)/external/opencore/android \\r
-    $(TOP)/vendor/qcom/proprietary/qdsp6/mm-core/omxcore/inc \\r
+    $(TOP)/frameworks/base/include/media/stagefright/openmax \\r
     $(TOP)/frameworks/media/libvideoeditor/osal/inc \\r
     $(TOP)/frameworks/media/libvideoeditor/vss/common/inc \\r
     $(TOP)/frameworks/media/libvideoeditor/vss/mcs/inc \\r

diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk
index 297bfa7..eaac2bd 100755 (executable)
--- a/libvideoeditor/vss/stagefrightshells/src/Android.mk
+++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk
@@ -38,9 +38,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 \