diff options
Diffstat (limited to 'media/libstagefright')
24 files changed, 44 insertions, 45 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 8948abb..2169cac 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -include frameworks/base/media/libstagefright/codecs/common/Config.mk +include frameworks/av/media/libstagefright/codecs/common/Config.mk LOCAL_SRC_FILES:= \ ACodec.cpp \ @@ -57,7 +57,7 @@ LOCAL_SRC_FILES:= \ avc_utils.cpp \ LOCAL_C_INCLUDES:= \ - $(TOP)/frameworks/base/include/media/stagefright/timedtext \ + $(TOP)/frameworks/av/include/media/stagefright/timedtext \ $(TOP)/frameworks/native/include/media/hardware \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/expat/lib \ diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk index d595686..6ab2a00 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES:= \ support.cpp LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright \ $(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 fd6de79..b4445a7 100644 --- a/media/libstagefright/codecs/aacdec/Android.mk +++ b/media/libstagefright/codecs/aacdec/Android.mk @@ -147,7 +147,7 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO -DOSCL_IMPORT_REF= -DOSCL_EXPORT_REF= -DOSCL_UNUSED_ARG= LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ LOCAL_ARM_MODE := arm @@ -163,7 +163,7 @@ LOCAL_SRC_FILES := \ SoftAAC.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ 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 b47cb1e..0ad3f6c 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -include frameworks/base/media/libstagefright/codecs/common/Config.mk +include frameworks/av/media/libstagefright/codecs/common/Config.mk @@ -64,9 +64,9 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ - frameworks/base/media/libstagefright/codecs/common/include \ - frameworks/base/include \ + frameworks/av/include \ + frameworks/av/media/libstagefright/include \ + frameworks/av/media/libstagefright/codecs/common/include \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/inc \ $(LOCAL_PATH)/basic_op @@ -94,8 +94,8 @@ LOCAL_SRC_FILES := \ SoftAACEncoder.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ - frameworks/base/media/libstagefright/codecs/common/include \ + frameworks/av/media/libstagefright/include \ + frameworks/av/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 b81306d..5dc5560 100644 --- a/media/libstagefright/codecs/amrnb/dec/Android.mk +++ b/media/libstagefright/codecs/amrnb/dec/Android.mk @@ -39,7 +39,7 @@ LOCAL_SRC_FILES := \ src/wmf_to_ets.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../common/include \ @@ -60,8 +60,8 @@ LOCAL_SRC_FILES := \ SoftAMR.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ - frameworks/base/media/libstagefright/codecs/amrwb/src \ + frameworks/av/media/libstagefright/include \ + frameworks/av/media/libstagefright/codecs/amrwb/src \ frameworks/native/include/media/openmax \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ diff --git a/media/libstagefright/codecs/amrnb/enc/Android.mk b/media/libstagefright/codecs/amrnb/enc/Android.mk index 28246ae..d6e8b66 100644 --- a/media/libstagefright/codecs/amrnb/enc/Android.mk +++ b/media/libstagefright/codecs/amrnb/enc/Android.mk @@ -61,7 +61,7 @@ LOCAL_SRC_FILES := \ src/ton_stab.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../common/include \ @@ -82,7 +82,7 @@ LOCAL_SRC_FILES := \ SoftAMRNBEncoder.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ frameworks/native/include/media/openmax \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ diff --git a/media/libstagefright/codecs/amrwb/Android.mk b/media/libstagefright/codecs/amrwb/Android.mk index c9e1c25..677107f 100644 --- a/media/libstagefright/codecs/amrwb/Android.mk +++ b/media/libstagefright/codecs/amrwb/Android.mk @@ -43,7 +43,7 @@ LOCAL_SRC_FILES := \ src/weight_amrwb_lpc.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index d3c3041..71a60d3 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -include frameworks/base/media/libstagefright/codecs/common/Config.mk +include frameworks/av/media/libstagefright/codecs/common/Config.mk @@ -95,9 +95,9 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ - frameworks/base/media/libstagefright/codecs/common/include \ - frameworks/base/include \ + frameworks/av/include \ + frameworks/av/media/libstagefright/include \ + frameworks/av/media/libstagefright/codecs/common/include \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/inc @@ -124,8 +124,8 @@ LOCAL_SRC_FILES := \ SoftAMRWBEncoder.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ - frameworks/base/media/libstagefright/codecs/common/include \ + frameworks/av/media/libstagefright/include \ + frameworks/av/media/libstagefright/codecs/common/include \ frameworks/native/include/media/openmax LOCAL_STATIC_LIBRARIES := \ diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk index 54cc9b1..d80d3f8 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -25,7 +25,7 @@ LOCAL_MODULE := libstagefright_avcenc LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/../common/include \ - $(TOP)/frameworks/base/media/libstagefright/include \ + $(TOP)/frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS := \ diff --git a/media/libstagefright/codecs/g711/dec/Android.mk b/media/libstagefright/codecs/g711/dec/Android.mk index 42706a5..28be646 100644 --- a/media/libstagefright/codecs/g711/dec/Android.mk +++ b/media/libstagefright/codecs/g711/dec/Android.mk @@ -5,7 +5,7 @@ LOCAL_SRC_FILES := \ SoftG711.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES := \ diff --git a/media/libstagefright/codecs/m4v_h263/dec/Android.mk b/media/libstagefright/codecs/m4v_h263/dec/Android.mk index 8c245d1..a6b1edc 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/Android.mk +++ b/media/libstagefright/codecs/m4v_h263/dec/Android.mk @@ -41,7 +41,7 @@ LOCAL_MODULE := libstagefright_m4vh263dec LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ - $(TOP)/frameworks/base/media/libstagefright/include \ + $(TOP)/frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS := -DOSCL_EXPORT_REF= -DOSCL_IMPORT_REF= @@ -58,7 +58,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ 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 2b7c938..7cbb38f 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/media/libstagefright/include \ + $(TOP)/frameworks/av/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 ed51aa5..ec8d7ec 100644 --- a/media/libstagefright/codecs/mp3dec/Android.mk +++ b/media/libstagefright/codecs/mp3dec/Android.mk @@ -43,7 +43,7 @@ LOCAL_SRC_FILES += \ endif LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include @@ -64,7 +64,7 @@ LOCAL_SRC_FILES := \ SoftMP3.cpp LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ 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 2997228..3223871 100644 --- a/media/libstagefright/codecs/on2/dec/Android.mk +++ b/media/libstagefright/codecs/on2/dec/Android.mk @@ -8,7 +8,7 @@ LOCAL_C_INCLUDES := \ $(TOP)/external/libvpx \ $(TOP)/external/libvpx/vpx_codec \ $(TOP)/external/libvpx/vpx_ports \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ frameworks/native/include/media/openmax \ LOCAL_STATIC_LIBRARIES := \ diff --git a/media/libstagefright/codecs/on2/h264dec/Android.mk b/media/libstagefright/codecs/on2/h264dec/Android.mk index 43c20f0..772fd60 100644 --- a/media/libstagefright/codecs/on2/h264dec/Android.mk +++ b/media/libstagefright/codecs/on2/h264dec/Android.mk @@ -34,7 +34,7 @@ LOCAL_SRC_FILES := \ SoftAVC.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/./inc \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ frameworks/native/include/media/openmax \ MY_ASM := \ diff --git a/media/libstagefright/codecs/vorbis/dec/Android.mk b/media/libstagefright/codecs/vorbis/dec/Android.mk index fca70b7..395dd6b 100644 --- a/media/libstagefright/codecs/vorbis/dec/Android.mk +++ b/media/libstagefright/codecs/vorbis/dec/Android.mk @@ -6,7 +6,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ external/tremolo \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright/include \ frameworks/native/include/media/openmax \ LOCAL_SHARED_LIBRARIES := \ diff --git a/media/libstagefright/foundation/Android.mk b/media/libstagefright/foundation/Android.mk index d5025a1..b7577d6 100644 --- a/media/libstagefright/foundation/Android.mk +++ b/media/libstagefright/foundation/Android.mk @@ -15,7 +15,7 @@ LOCAL_SRC_FILES:= \ hexdump.cpp LOCAL_C_INCLUDES:= \ - frameworks/base/include/media/stagefright/foundation + frameworks/av/include/media/stagefright/foundation LOCAL_SHARED_LIBRARIES := \ libbinder \ diff --git a/media/libstagefright/httplive/Android.mk b/media/libstagefright/httplive/Android.mk index 90cb448..a3fa7a3 100644 --- a/media/libstagefright/httplive/Android.mk +++ b/media/libstagefright/httplive/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \ M3UParser.cpp \ LOCAL_C_INCLUDES:= \ - $(TOP)/frameworks/base/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/openssl/include diff --git a/media/libstagefright/mpeg2ts/Android.mk b/media/libstagefright/mpeg2ts/Android.mk index eaa139d..c1a7a9d 100644 --- a/media/libstagefright/mpeg2ts/Android.mk +++ b/media/libstagefright/mpeg2ts/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES:= \ MPEG2TSExtractor.cpp \ LOCAL_C_INCLUDES:= \ - $(TOP)/frameworks/base/media/libstagefright \ + $(TOP)/frameworks/av/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 d20ecb6..d7fbbbe 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES:= \ SoftOMXPlugin.cpp \ LOCAL_C_INCLUDES += \ - frameworks/base/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/hardware \ $(TOP)/frameworks/native/include/media/openmax diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index 6aa7470..04441ca 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -8,7 +8,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright libbinder libmedia libutils libstagefright_foundation LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright \ $(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 e0fe59b..d0f5259 100644 --- a/media/libstagefright/rtsp/Android.mk +++ b/media/libstagefright/rtsp/Android.mk @@ -18,7 +18,7 @@ LOCAL_SRC_FILES:= \ ASessionDescription.cpp \ LOCAL_C_INCLUDES:= \ - $(TOP)/frameworks/base/media/libstagefright/include \ + $(TOP)/frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/openssl/include @@ -44,7 +44,7 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_rtsp LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + frameworks/av/media/libstagefright \ $(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 656a630..a1e6be7 100644 --- a/media/libstagefright/tests/Android.mk +++ b/media/libstagefright/tests/Android.mk @@ -15,7 +15,6 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libEGL \ libGLESv2 \ - libandroid \ libbinder \ libcutils \ libgui \ @@ -36,8 +35,8 @@ LOCAL_C_INCLUDES := \ bionic/libstdc++/include \ external/gtest/include \ external/stlport/stlport \ - frameworks/base/media/libstagefright \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright \ + frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ include $(BUILD_EXECUTABLE) diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk index 58ef9e3..f099bbd 100644 --- a/media/libstagefright/timedtext/Android.mk +++ b/media/libstagefright/timedtext/Android.mk @@ -11,8 +11,8 @@ LOCAL_SRC_FILES:= \ LOCAL_CFLAGS += -Wno-multichar LOCAL_C_INCLUDES:= \ - $(TOP)/frameworks/base/include/media/stagefright/timedtext \ - $(TOP)/frameworks/base/media/libstagefright + $(TOP)/frameworks/av/include/media/stagefright/timedtext \ + $(TOP)/frameworks/av/media/libstagefright LOCAL_MODULE:= libstagefright_timedtext |