Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb

Browse Source 
* commit '0a3dbf6f69a72d557afca69f006a407fbfc2482d':
  Fix the build break in git_master-without-vendor
This commit is contained in:
James Dong
2011-01-18 13:28:47 -08:00
committed by Android Git Automerger
parent b5f0871459 0a3dbf6f69
commit 1b67fec7e1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/mediaeditor/Android.mk
View File

@@ -36,9 +36,7 @@ LOCAL_C_INCLUDES += \
$(TOP)/frameworks/base/media/libstagefright/rtsp \ $(TOP)/frameworks/base/media/libstagefright/rtsp \
$(JNI_H_INCLUDE) \ $(JNI_H_INCLUDE) \
$(call include-path-for, corecg graphics) \ $(call include-path-for, corecg graphics) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ $(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/external/opencore/android \
$(TOP)/vendor/qcom/proprietary/qdsp6/mm-core/omxcore/inc \
$(TOP)/frameworks/base/core/jni/mediaeditor \ $(TOP)/frameworks/base/core/jni/mediaeditor \
$(TOP)/frameworks/media/libvideoeditor/vss/inc \ $(TOP)/frameworks/media/libvideoeditor/vss/inc \
$(TOP)/frameworks/media/libvideoeditor/vss/common/inc \ $(TOP)/frameworks/media/libvideoeditor/vss/common/inc \