Merge "Better partitioning module/non-module libraries" into udc-dev (ad065b76) · Commits · e / os / android_frameworks_av

media/libstagefright/Android.bp

+6 −3

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ cc_library_shared {
		},
		}

		// this library gets wrapped into libstagefright as well as modules
		cc_library_static {
		name: "libstagefright_mpeg2extractor",
		apex_available: [
		@@ -241,7 +242,6 @@ cc_library {
		"CodecErrorLog.cpp",
		"CryptoAsync.cpp",
		"FrameDecoder.cpp",
		"HevcUtils.cpp",
		"InterfaceUtils.cpp",
		"JPEGSource.cpp",
		"MPEG2TSWriter.cpp",
		@@ -255,7 +255,6 @@ cc_library {
		"MediaCodecSource.cpp",
		"MediaExtractor.cpp",
		"MediaExtractorFactory.cpp",
		"MediaSource.cpp",
		"MediaSync.cpp",
		"MediaTrack.cpp",
		"MediaMuxer.cpp",
		@@ -269,7 +268,6 @@ cc_library {
		"StagefrightMediaScanner.cpp",
		"SurfaceUtils.cpp",
		"ThrottledSource.cpp",
		"Utils.cpp",
		"VideoFrameSchedulerBase.cpp",
		"VideoFrameScheduler.cpp",
		],
		@@ -328,6 +326,11 @@ cc_library {
		"libmedia_ndkformatpriv",
		],

		// to get Utils, MediaSource, HevcUtils
		whole_static_libs: [
		"libstagefright_mpeg2extractor",
		],

		header_libs:[
		"libmediadrm_headers",
		"libnativeloader-headers",