Merge "Clean up build rule for libmedia2_jni" (80c9377e) · Commits · e / os / android_frameworks_base

media/jni/Android.bp

+17 −16

Original line number	Diff line number	Diff line
		@@ -94,26 +94,14 @@ cc_library_shared {
		],

		shared_libs: [
		// MediaCas
		"android.hardware.cas@1.0",
		"android.hardware.cas.native@1.0",
		"android.hidl.allocator@1.0",
		"libhidlbase",
		"libhidlmemory",

		"libmediametrics",
		"libbinder", // Used by JWakeLock and MediaMetrics.

		"libutils", // Have to use shared lib to make libandroid_runtime behave correctly.
		// Otherwise, AndroidRuntime::getJNIEnv() will return NULL.

		// NDK or NDK-compliant
		// NDK or LLNDK or NDK-compliant
		"libandroid",
		"libbinder_ndk",
		"libmediandk",
		"libmediametrics",
		"libnativehelper_compat_libc++",
		"liblog",
		"libz",
		"libvndksupport",
		],

		header_libs: [
		@@ -122,6 +110,16 @@ cc_library_shared {
		],

		static_libs: [
		// MediaCas
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"libhidlbase",
		"libhidlmemory",
		"libhidltransport",
		"libhwbinder",
		"libbinderthreadstate",

		// MediaPlayer2 implementation
		"libbase",
		"libcrypto",
		"libcutils",
		@@ -131,10 +129,11 @@ cc_library_shared {
		"libmediaplayer2-protos",
		"libmediandk_utils",
		"libmediautils",
		"libprocessgroup",
		"libprotobuf-cpp-lite",
		"libstagefright",
		"libstagefright_esds",
		"libstagefright_foundation",
		"libstagefright_foundation_without_imemory",
		"libstagefright_httplive",
		"libstagefright_id3",
		"libstagefright_mpeg2support",
		@@ -142,6 +141,7 @@ cc_library_shared {
		"libstagefright_player2",
		"libstagefright_rtsp_player2",
		"libstagefright_timedtext2",
		"libutils",
		"libmedia2_jni_core",
		],

		@@ -161,6 +161,7 @@ cc_library_shared {
		"-Wno-error=deprecated-declarations",
		"-Wunused",
		"-Wunreachable-code",
		"-fvisibility=hidden",
		],

		ldflags: ["-Wl,--exclude-libs=ALL,-error-limit=0"],