Merge "Remove MediaPlayer2" am: a63468a847 am: 038672258e (a731a795) · Commits · e / os / android_frameworks_av

drm/libmediadrm/Android.bp

+1 −3

Original line number	Diff line number	Diff line
		@@ -2,9 +2,7 @@
		// libmediadrm
		//

		// TODO: change it back to cc_library_shared when MediaPlayer2 switches to
		// using NdkMediaDrm, instead of MediaDrm.java.
		cc_library {
		cc_library_shared {
		name: "libmediadrm",

		srcs: [

media/libmediaplayer2/Android.bp

deleted100644 → 0

+0 −129

Original line number	Diff line number	Diff line
		cc_library_headers {
		name: "libmediaplayer2_headers",
		vendor_available: true,
		export_include_dirs: ["include"],
		}

		cc_library_static {
		name: "libmediaplayer2",

		srcs: [
		"MediaPlayer2AudioOutput.cpp",
		"mediaplayer2.cpp",
		],

		shared_libs: [
		"libandroid_runtime",
		"libaudioclient",
		"libbinder",
		"libbinder_ndk",
		"libcutils",
		"libgui",
		"liblog",
		"libmedia_omx",
		"libui",
		"libutils",

		"libcrypto",
		"libmediametrics",
		"libmediandk",
		"libmediandk_utils",
		"libmediautils",
		"libmemunreachable",
		"libnativewindow",
		"libpowermanager",
		"libstagefright_httplive",
		],

		export_shared_lib_headers: [
		"libaudioclient",
		"libbinder",
		"libgui",
		"libmedia_omx",
		],

		header_libs: [
		"media_plugin_headers",
		],

		include_dirs: [
		"frameworks/base/core/jni",
		],

		static_libs: [
		"libmedia_helper",
		"libmediaplayer2-protos",
		"libmedia_player2_util",
		"libprotobuf-cpp-lite",
		"libstagefright_foundation_without_imemory",
		"libstagefright_nuplayer2",
		"libstagefright_player2",
		"libstagefright_rtsp",
		"libstagefright_timedtext2",
		"libmedia2_jni_core",
		],

		export_include_dirs: [
		"include",
		],

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

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

		cc_library {
		name: "libmedia2_jni_core",

		srcs: [
		"JavaVMHelper.cpp",
		"JAudioTrack.cpp",
		"JMedia2HTTPService.cpp",
		"JMedia2HTTPConnection.cpp",
		],

		header_libs: [
		"libbinder_headers",
		"libnativehelper_header_only",
		],

		shared_libs: [
		"liblog",
		"libutils",
		"libdl",
		],

		include_dirs: [
		"frameworks/av/media/libmedia/include",
		"frameworks/base/core/jni",
		],

		export_include_dirs: [
		"include",
		],

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

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

		}