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/libaah_rtp/Android.mk | 4 ++-- media/libmedia/Android.mk | 2 +- media/libmedia/MediaProfiles.cpp | 2 +- media/libmediaplayerservice/Android.mk | 6 +++--- media/libmediaplayerservice/nuplayer/Android.mk | 8 ++++---- media/libstagefright/Android.mk | 3 ++- media/libstagefright/OMXCodec.cpp | 2 +- media/libstagefright/SurfaceMediaSource.cpp | 4 ++-- media/libstagefright/chromium_http/Android.mk | 2 +- 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 +- media/libstagefright/colorconversion/Android.mk | 2 +- media/libstagefright/httplive/Android.mk | 6 +++--- media/libstagefright/matroska/Android.mk | 2 +- media/libstagefright/mpeg2ts/Android.mk | 4 ++-- media/libstagefright/omx/Android.mk | 3 ++- media/libstagefright/omx/OMXMaster.h | 2 +- media/libstagefright/omx/OMXNodeInstance.cpp | 2 +- media/libstagefright/omx/SoftOMXPlugin.h | 2 +- media/libstagefright/omx/tests/Android.mk | 2 +- media/libstagefright/rtsp/Android.mk | 8 ++++---- media/libstagefright/tests/Android.mk | 2 +- 33 files changed, 55 insertions(+), 53 deletions(-) (limited to 'media') diff --git a/media/libaah_rtp/Android.mk b/media/libaah_rtp/Android.mk index 54fd9ec..1e87cf0 100644 --- a/media/libaah_rtp/Android.mk +++ b/media/libaah_rtp/Android.mk @@ -21,9 +21,9 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/include \ - frameworks/base/include/media/stagefright/openmax \ frameworks/base/media \ - frameworks/base/media/libstagefright + frameworks/base/media/libstagefright \ + frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES := \ libcommon_time_client \ diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 23670df..5ecc8f5 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -57,7 +57,7 @@ LOCAL_MODULE:= libmedia LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ + $(TOP)/frameworks/native/include/media/openmax \ external/icu4c/common \ external/expat/lib \ system/media/audio_effects/include \ diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 93ddca8..9c46009 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace android { diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index e521648..41bcab0 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -36,13 +36,13 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_nuplayer \ libstagefright_rtsp \ -LOCAL_C_INCLUDES := \ +LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ $(TOP)/frameworks/base/media/libstagefright/include \ $(TOP)/frameworks/base/media/libstagefright/rtsp \ - $(TOP)/external/tremolo/Tremolo \ + $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/external/tremolo/Tremolo LOCAL_MODULE:= libmediaplayerservice diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk index 33e2f93..9b485d7 100644 --- a/media/libmediaplayerservice/nuplayer/Android.mk +++ b/media/libmediaplayerservice/nuplayer/Android.mk @@ -12,11 +12,11 @@ LOCAL_SRC_FILES:= \ StreamingSource.cpp \ LOCAL_C_INCLUDES := \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ + $(TOP)/frameworks/base/media/libstagefright/httplive \ $(TOP)/frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/media/libstagefright/mpeg2ts \ - $(TOP)/frameworks/base/media/libstagefright/httplive \ - $(TOP)/frameworks/base/media/libstagefright/rtsp \ + $(TOP)/frameworks/base/media/libstagefright/mpeg2ts \ + $(TOP)/frameworks/base/media/libstagefright/rtsp \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_MODULE:= libstagefright_nuplayer diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 5aea8d0..047b4cb 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -57,8 +57,9 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ $(TOP)/frameworks/base/include/media/stagefright/timedtext \ + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/expat/lib \ $(TOP)/external/flac/include \ $(TOP)/external/tremolo \ diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 966416e..278e3a2 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -27,9 +27,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index ab2cff0..602469b 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk index 63775f1..e37b4a8 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ + $(TOP)/frameworks/native/include/media/openmax \ external/chromium \ external/chromium/android 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 \ diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk index 62ba40f..59a64ba 100644 --- a/media/libstagefright/colorconversion/Android.mk +++ b/media/libstagefright/colorconversion/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES:= \ SoftwareRenderer.cpp LOCAL_C_INCLUDES := \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ + $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/hardware/msm7k LOCAL_MODULE:= libstagefright_color_conversion diff --git a/media/libstagefright/httplive/Android.mk b/media/libstagefright/httplive/Android.mk index 9225e41..a5990c3 100644 --- a/media/libstagefright/httplive/Android.mk +++ b/media/libstagefright/httplive/Android.mk @@ -9,9 +9,9 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ - $(TOP)/frameworks/base/media/libstagefright \ - $(TOP)/external/openssl/include + $(TOP)/frameworks/base/media/libstagefright \ + $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/external/openssl/include LOCAL_MODULE:= libstagefright_httplive diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk index 1f1c68b..e67da4c 100644 --- a/media/libstagefright/matroska/Android.mk +++ b/media/libstagefright/matroska/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ $(TOP)/external/libvpx/mkvparser \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ + $(TOP)/frameworks/native/include/media/openmax \ LOCAL_CFLAGS += -Wno-multichar diff --git a/media/libstagefright/mpeg2ts/Android.mk b/media/libstagefright/mpeg2ts/Android.mk index 578c669..ac4c2a1 100644 --- a/media/libstagefright/mpeg2ts/Android.mk +++ b/media/libstagefright/mpeg2ts/Android.mk @@ -11,8 +11,8 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ - $(TOP)/frameworks/base/media/libstagefright + $(TOP)/frameworks/base/media/libstagefright \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_MODULE:= libstagefright_mpeg2ts diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index d844f3d..f587a9c 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -14,7 +14,8 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES += \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES := \ libbinder \ diff --git a/media/libstagefright/omx/OMXMaster.h b/media/libstagefright/omx/OMXMaster.h index feee1f9..6069741 100644 --- a/media/libstagefright/omx/OMXMaster.h +++ b/media/libstagefright/omx/OMXMaster.h @@ -18,7 +18,7 @@ #define OMX_MASTER_H_ -#include +#include #include #include diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 099c4f5..bff3def 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -24,8 +24,8 @@ #include #include +#include #include -#include #include namespace android { diff --git a/media/libstagefright/omx/SoftOMXPlugin.h b/media/libstagefright/omx/SoftOMXPlugin.h index f93c323..c89cd87 100644 --- a/media/libstagefright/omx/SoftOMXPlugin.h +++ b/media/libstagefright/omx/SoftOMXPlugin.h @@ -19,7 +19,7 @@ #define SOFT_OMX_PLUGIN_H_ #include -#include +#include namespace android { diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index 0c0a70c..07d47a8 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_MODULE := omx_tests diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk index 8230347..b3bc37c 100644 --- a/media/libstagefright/rtsp/Android.mk +++ b/media/libstagefright/rtsp/Android.mk @@ -19,9 +19,9 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ - $(TOP)/frameworks/base/media/libstagefright/include \ - $(TOP)/external/openssl/include + $(TOP)/frameworks/base/media/libstagefright/include \ + $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/external/openssl/include LOCAL_MODULE:= libstagefright_rtsp @@ -47,7 +47,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar diff --git a/media/libstagefright/tests/Android.mk b/media/libstagefright/tests/Android.mk index 357feb1..656a630 100644 --- a/media/libstagefright/tests/Android.mk +++ b/media/libstagefright/tests/Android.mk @@ -38,7 +38,7 @@ LOCAL_C_INCLUDES := \ external/stlport/stlport \ frameworks/base/media/libstagefright \ frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ + $(TOP)/frameworks/native/include/media/openmax \ include $(BUILD_EXECUTABLE) -- cgit v1.1