diff options
| author | James Dong <jdong@google.com> | 2011-01-18 13:26:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-18 13:26:16 -0800 |
| commit | cd6155846aa6f61ba9d958843a134656596ac0e7 (patch) | |
| tree | 368d9fa488f75771529a3fec40b6fe6b334c4036 | |
| parent | 54fdc70b5592e4095b892b63bae4102f11399bfd (diff) | |
| parent | ba119eb166c9c06060c3d05b23202402287d7566 (diff) | |
| download | frameworks_av-cd6155846aa6f61ba9d958843a134656596ac0e7.zip frameworks_av-cd6155846aa6f61ba9d958843a134656596ac0e7.tar.gz frameworks_av-cd6155846aa6f61ba9d958843a134656596ac0e7.tar.bz2 | |
Merge "Fix git_master-without-vendor build" into honeycomb
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 6 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/Android.mk | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 51022bd..23550ce 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -37,7 +37,7 @@ LOCAL_SRC_FILES:= \ VideoEditorBGAudioProcessing.cpp \
PreviewRenderer.cpp
-LOCAL_MODULE_TAGS := development
+LOCAL_MODULE_TAGS := eng development
LOCAL_STATIC_LIBRARIES := \
libvideoeditor_osal \
@@ -68,9 +68,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/media/libvideoeditor/osal/inc \
$(TOP)/frameworks/media/libvideoeditor/vss/common/inc \
$(TOP)/frameworks/media/libvideoeditor/vss/mcs/inc \
diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index 297bfa7..eaac2bd 100755 --- 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 \ |