Merge "Add explicit apex_available clauses" (c2f2752d) · Commits · e / os / platform_frameworks_native

headers/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,11 @@ cc_library_headers {
		"libstagefright_foundation_headers",
		],
		min_sdk_version: "29",
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],

		host_supported: true,
		target: {

+7 −0

Original line number	Diff line number	Diff line
		@@ -57,4 +57,11 @@ cc_library_static {
		},
		},
		min_sdk_version: "29",
		// static link, so it won't straddle a module boundary at runtime.
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],

		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ cc_library_static {
		target: {
		darwin: {
		enabled: false,
		}
		},
		},

		shared_libs: [
		@@ -46,6 +46,11 @@ cc_library_static {
		"-Werror",
		],
		min_sdk_version: "29",
		// static link, so it won't straddle a module boundary at runtime.
		apex_available: [
		"//apex_available:platform",
		"com.android.media.swcodec",
		],
		}

		hidl_package_root {