From 6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb Mon Sep 17 00:00:00 2001 From: James Dong Date: Mon, 12 Mar 2012 14:37:53 -0700 Subject: Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795 --- media/libstagefright/codecs/aacdec/Android.mk | 2 +- media/libstagefright/codecs/aacenc/Android.mk | 4 ++-- media/libstagefright/codecs/amrnb/dec/Android.mk | 6 +++--- media/libstagefright/codecs/amrnb/enc/Android.mk | 2 +- media/libstagefright/codecs/amrwbenc/Android.mk | 4 ++-- media/libstagefright/codecs/avc/enc/Android.mk | 4 ++-- media/libstagefright/codecs/g711/dec/Android.mk | 2 +- media/libstagefright/codecs/m4v_h263/dec/Android.mk | 4 ++-- media/libstagefright/codecs/m4v_h263/enc/Android.mk | 4 ++-- media/libstagefright/codecs/mp3dec/Android.mk | 2 +- media/libstagefright/codecs/on2/dec/Android.mk | 2 +- media/libstagefright/codecs/on2/h264dec/Android.mk | 2 +- media/libstagefright/codecs/vorbis/dec/Android.mk | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) (limited to 'media/libstagefright/codecs') diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk index 20c7bc0..fd6de79 100644 --- a/media/libstagefright/codecs/aacdec/Android.mk +++ b/media/libstagefright/codecs/aacdec/Android.mk @@ -164,7 +164,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax LOCAL_CFLAGS := -DOSCL_IMPORT_REF= diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk index 509193c..b47cb1e 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -94,9 +94,9 @@ LOCAL_SRC_FILES := \ SoftAACEncoder.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/base/media/libstagefright/include \ frameworks/base/media/libstagefright/codecs/common/include \ + frameworks/native/include/media/openmax LOCAL_CFLAGS := -DOSCL_IMPORT_REF= diff --git a/media/libstagefright/codecs/amrnb/dec/Android.mk b/media/libstagefright/codecs/amrnb/dec/Android.mk index 23a22ef..b81306d 100644 --- a/media/libstagefright/codecs/amrnb/dec/Android.mk +++ b/media/libstagefright/codecs/amrnb/dec/Android.mk @@ -61,12 +61,12 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/base/media/libstagefright/codecs/amrwb/src \ + frameworks/native/include/media/openmax \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../common/include \ - $(LOCAL_PATH)/../common \ - frameworks/base/media/libstagefright/codecs/amrwb/src \ + $(LOCAL_PATH)/../common LOCAL_CFLAGS := -DOSCL_IMPORT_REF= diff --git a/media/libstagefright/codecs/amrnb/enc/Android.mk b/media/libstagefright/codecs/amrnb/enc/Android.mk index 94e8726..21937bf 100644 --- a/media/libstagefright/codecs/amrnb/enc/Android.mk +++ b/media/libstagefright/codecs/amrnb/enc/Android.mk @@ -84,7 +84,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../common/include \ diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index 6ce6171..3a46ec8 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -125,9 +125,9 @@ LOCAL_SRC_FILES := \ SoftAMRWBEncoder.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/base/media/libstagefright/include \ frameworks/base/media/libstagefright/codecs/common/include \ + frameworks/native/include/media/openmax LOCAL_STATIC_LIBRARIES := \ libstagefright_amrwbenc diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk index eb2e320..54cc9b1 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -25,8 +25,8 @@ LOCAL_MODULE := libstagefright_avcenc LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/../common/include \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ - $(TOP)/frameworks/base/media/libstagefright/include + $(TOP)/frameworks/base/media/libstagefright/include \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS := \ -D__arm__ \ diff --git a/media/libstagefright/codecs/g711/dec/Android.mk b/media/libstagefright/codecs/g711/dec/Android.mk index 6692533..42706a5 100644 --- a/media/libstagefright/codecs/g711/dec/Android.mk +++ b/media/libstagefright/codecs/g711/dec/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES := \ libstagefright libstagefright_omx libstagefright_foundation libutils diff --git a/media/libstagefright/codecs/m4v_h263/dec/Android.mk b/media/libstagefright/codecs/m4v_h263/dec/Android.mk index 2ffa5f2..8c245d1 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/Android.mk +++ b/media/libstagefright/codecs/m4v_h263/dec/Android.mk @@ -42,7 +42,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(TOP)/frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS := -DOSCL_EXPORT_REF= -DOSCL_IMPORT_REF= @@ -59,7 +59,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax LOCAL_CFLAGS := -DOSCL_EXPORT_REF= -DOSCL_IMPORT_REF= diff --git a/media/libstagefright/codecs/m4v_h263/enc/Android.mk b/media/libstagefright/codecs/m4v_h263/enc/Android.mk index 43318e9..2b7c938 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/Android.mk +++ b/media/libstagefright/codecs/m4v_h263/enc/Android.mk @@ -31,7 +31,7 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ - $(TOP)/frameworks/base/media/libstagefright/include + $(TOP)/frameworks/base/media/libstagefright/include \ + $(TOP)/frameworks/native/include/media/openmax include $(BUILD_STATIC_LIBRARY) diff --git a/media/libstagefright/codecs/mp3dec/Android.mk b/media/libstagefright/codecs/mp3dec/Android.mk index a08c9f0..ed51aa5 100644 --- a/media/libstagefright/codecs/mp3dec/Android.mk +++ b/media/libstagefright/codecs/mp3dec/Android.mk @@ -65,7 +65,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include diff --git a/media/libstagefright/codecs/on2/dec/Android.mk b/media/libstagefright/codecs/on2/dec/Android.mk index 32bbd6b..2997228 100644 --- a/media/libstagefright/codecs/on2/dec/Android.mk +++ b/media/libstagefright/codecs/on2/dec/Android.mk @@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := \ $(TOP)/external/libvpx/vpx_codec \ $(TOP)/external/libvpx/vpx_ports \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax \ LOCAL_STATIC_LIBRARIES := \ libvpx diff --git a/media/libstagefright/codecs/on2/h264dec/Android.mk b/media/libstagefright/codecs/on2/h264dec/Android.mk index 5b3c876..43c20f0 100644 --- a/media/libstagefright/codecs/on2/h264dec/Android.mk +++ b/media/libstagefright/codecs/on2/h264dec/Android.mk @@ -35,7 +35,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/./inc \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax \ MY_ASM := \ ./source/arm_neon_asm_gcc/h264bsdWriteMacroblock.S \ diff --git a/media/libstagefright/codecs/vorbis/dec/Android.mk b/media/libstagefright/codecs/vorbis/dec/Android.mk index f33f3ac..fca70b7 100644 --- a/media/libstagefright/codecs/vorbis/dec/Android.mk +++ b/media/libstagefright/codecs/vorbis/dec/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ external/tremolo \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax \ LOCAL_SHARED_LIBRARIES := \ libvorbisidec libstagefright libstagefright_omx \ -- cgit v1.1