Merge "Convert libstagefright to Android.bp" am: 2e112d7777 (d6d9ec31) · Commits · e / os / android_frameworks_av

media/libmedia/Android.bp

+5 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,11 @@ cc_library_shared {

		header_libs: ["libaudioeffects"],

		export_shared_lib_headers: ["libbinder"],
		export_shared_lib_headers: [
		"libbinder",
		"libicuuc",
		"libicui18n",
		],

		whole_static_libs: ["libmedia_helper"],

media/libstagefright/Android.bp

+155 −1

Original line number	Diff line number	Diff line
		subdirs = ["foundation"]
		cc_library_shared {
		name: "libstagefright",

		srcs: [
		"ACodec.cpp",
		"AACExtractor.cpp",
		"AACWriter.cpp",
		"AMRExtractor.cpp",
		"AMRWriter.cpp",
		"AudioPlayer.cpp",
		"AudioSource.cpp",
		"CallbackDataSource.cpp",
		"CameraSource.cpp",
		"CameraSourceTimeLapse.cpp",
		"CodecBase.cpp",
		"DataConverter.cpp",
		"DataSource.cpp",
		"DataURISource.cpp",
		"DRMExtractor.cpp",
		"ESDS.cpp",
		"FileSource.cpp",
		"FLACExtractor.cpp",
		"FrameRenderTracker.cpp",
		"HTTPBase.cpp",
		"HevcUtils.cpp",
		"JPEGSource.cpp",
		"MP3Extractor.cpp",
		"MPEG2TSWriter.cpp",
		"MPEG4Extractor.cpp",
		"MPEG4Writer.cpp",
		"MediaAdapter.cpp",
		"MediaClock.cpp",
		"MediaCodec.cpp",
		"MediaCodecList.cpp",
		"MediaCodecListOverrides.cpp",
		"MediaCodecSource.cpp",
		"MediaExtractor.cpp",
		"MediaSync.cpp",
		"MidiExtractor.cpp",
		"http/MediaHTTP.cpp",
		"MediaMuxer.cpp",
		"MediaSource.cpp",
		"NuCachedSource2.cpp",
		"NuMediaExtractor.cpp",
		"OMXClient.cpp",
		"OggExtractor.cpp",
		"SampleIterator.cpp",
		"SampleTable.cpp",
		"SimpleDecodingSource.cpp",
		"SkipCutBuffer.cpp",
		"StagefrightMediaScanner.cpp",
		"StagefrightMetadataRetriever.cpp",
		"SurfaceMediaSource.cpp",
		"SurfaceUtils.cpp",
		"ThrottledSource.cpp",
		"Utils.cpp",
		"VBRISeeker.cpp",
		"VideoFrameScheduler.cpp",
		"WAVExtractor.cpp",
		"WVMExtractor.cpp",
		"XINGSeeker.cpp",
		"avc_utils.cpp",
		],

		include_dirs: [
		"frameworks/native/include/media/openmax",
		"frameworks/native/include/media/hardware",
		],

		shared_libs: [
		"libaudioutils",
		"libbinder",
		"libcamera_client",
		"libcutils",
		"libdl",
		"libdrmframework",
		"libexpat",
		"libgui",
		"liblog",
		"libmedia",
		"libaudioclient",
		"libmediautils",
		"libnetd_client",
		"libsonivox",
		"libstagefright_omx",
		"libui",
		"libutils",
		"libvorbisidec",

		"libstagefright_foundation",
		"libdl",
		"libRScpp",
		],

		static_libs: [
		"libstagefright_color_conversion",
		"libyuv_static",
		"libstagefright_aacenc",
		"libstagefright_matroska",
		"libstagefright_mediafilter",
		"libstagefright_webm",
		"libstagefright_timedtext",
		"libvpx",
		"libwebm",
		"libstagefright_mpeg2ts",
		"libstagefright_id3",
		"libFLAC",
		"libmedia_helper",
		],

		export_shared_lib_headers: ["libmedia"],
		export_include_dirs: [
		".",
		"include",
		],

		cflags: [
		"-Wno-multichar",
		"-Werror",
		"-Wno-error=deprecated-declarations",
		"-Wall",
		],

		product_variables: {
		debuggable: {
		// enable experiments only in userdebug and eng builds
		cflags: ["-DENABLE_STAGEFRIGHT_EXPERIMENTS"],
		},
		},

		sanitize: {
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		],
		},
		}

		subdirs = [
		"codecs/*",
		"colorconversion",
		"filters",
		"foundation",
		"http",
		"httplive",
		"id3",
		"matroska",
		"mpeg2ts",
		"omx",
		"rtsp",
		"tests",
		"timedtext",
		"webm",
		"wifi-display",
		]

media/libstagefright/Android.mk

deleted100644 → 0

+0 −135

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)


		LOCAL_SRC_FILES:= \
		ACodec.cpp \
		AACExtractor.cpp \
		AACWriter.cpp \
		AMRExtractor.cpp \
		AMRWriter.cpp \
		AudioPlayer.cpp \
		AudioSource.cpp \
		CallbackDataSource.cpp \
		CameraSource.cpp \
		CameraSourceTimeLapse.cpp \
		CodecBase.cpp \
		DataConverter.cpp \
		DataSource.cpp \
		DataURISource.cpp \
		DRMExtractor.cpp \
		ESDS.cpp \
		FileSource.cpp \
		FLACExtractor.cpp \
		FrameRenderTracker.cpp \
		HTTPBase.cpp \
		HevcUtils.cpp \
		JPEGSource.cpp \
		MP3Extractor.cpp \
		MPEG2TSWriter.cpp \
		MPEG4Extractor.cpp \
		MPEG4Writer.cpp \
		MediaAdapter.cpp \
		MediaClock.cpp \
		MediaCodec.cpp \
		MediaCodecList.cpp \
		MediaCodecListOverrides.cpp \
		MediaCodecSource.cpp \
		MediaExtractor.cpp \
		MediaSync.cpp \
		MidiExtractor.cpp \
		http/MediaHTTP.cpp \
		MediaMuxer.cpp \
		MediaSource.cpp \
		NuCachedSource2.cpp \
		NuMediaExtractor.cpp \
		OMXClient.cpp \
		OggExtractor.cpp \
		SampleIterator.cpp \
		SampleTable.cpp \
		SimpleDecodingSource.cpp \
		SkipCutBuffer.cpp \
		StagefrightMediaScanner.cpp \
		StagefrightMetadataRetriever.cpp \
		SurfaceMediaSource.cpp \
		SurfaceUtils.cpp \
		ThrottledSource.cpp \
		Utils.cpp \
		VBRISeeker.cpp \
		VideoFrameScheduler.cpp \
		WAVExtractor.cpp \
		WVMExtractor.cpp \
		XINGSeeker.cpp \
		avc_utils.cpp \

		LOCAL_C_INCLUDES:= \
		$(TOP)/frameworks/av/include/media/ \
		$(TOP)/frameworks/av/include/media/stagefright/timedtext \
		$(TOP)/frameworks/native/include/media/hardware \
		$(TOP)/frameworks/native/include/media/openmax \
		$(TOP)/external/flac/include \
		$(TOP)/external/tremolo \
		$(TOP)/external/libvpx/libwebm \
		$(TOP)/external/icu/icu4c/source/common \
		$(TOP)/external/icu/icu4c/source/i18n \
		$(TOP)/system/netd/include \
		$(call include-path-for, audio-utils)

		LOCAL_SHARED_LIBRARIES := \
		libaudioutils \
		libbinder \
		libcamera_client \
		libcutils \
		libdl \
		libdrmframework \
		libexpat \
		libgui \
		liblog \
		libmedia \
		libaudioclient \
		libmediautils \
		libnetd_client \
		libsonivox \
		libstagefright_omx \
		libui \
		libutils \
		libvorbisidec \

		LOCAL_STATIC_LIBRARIES := \
		libstagefright_color_conversion \
		libyuv_static \
		libstagefright_aacenc \
		libstagefright_matroska \
		libstagefright_mediafilter \
		libstagefright_webm \
		libstagefright_timedtext \
		libvpx \
		libwebm \
		libstagefright_mpeg2ts \
		libstagefright_id3 \
		libFLAC \
		libmedia_helper \

		LOCAL_SHARED_LIBRARIES += \
		libstagefright_foundation \
		libdl \
		libRScpp \

		LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia

		LOCAL_CFLAGS += -Wno-multichar -Werror -Wno-error=deprecated-declarations -Wall

		# enable experiments only in userdebug and eng builds
		ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
		LOCAL_CFLAGS += -DENABLE_STAGEFRIGHT_EXPERIMENTS
		endif

		LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow

		LOCAL_MODULE:= libstagefright

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_SHARED_LIBRARY)

		include $(call all-makefiles-under,$(LOCAL_PATH))

media/libstagefright/StagefrightMetadataRetriever.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		#include <media/stagefright/MetaData.h>
		#include <media/stagefright/Utils.h>

		#include <CharacterEncodingDetector.h>
		#include <media/CharacterEncodingDetector.h>

		namespace android {

media/libstagefright/codecs/Android.mk

deleted100644 → 0

+0 −4

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		include $(call all-makefiles-under,$(LOCAL_PATH))