Merge "Replace include_dirs with header_libs" (6cee89b0) · Commits · e / os / android_frameworks_av

media/codec2/hidl/1.0/vts/functional/common/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@ cc_library_static {
		"libcodec2-hidl-client-defaults",
		],

		include_dirs: [
		"frameworks/av/media/codec2/hidl/client/include",
		header_libs: [
		"libcodec2_client_headers",
		],

		srcs: [

+18 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,24 @@ package {
		default_applicable_licenses: ["frameworks_av_license"],
		}

		cc_library_headers {
		name: "libcodec2_client_headers",
		export_include_dirs: ["include"],
		vendor_available: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],
		min_sdk_version: "29",
		host_supported: true,
		target: {
		darwin: {
		enabled: false,
		},
		},
		}

		cc_library {
		name: "libcodec2_client",

+6 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,12 @@ package {
		default_applicable_licenses: ["frameworks_av_license"],
		}

		cc_library_headers {
		name: "libsfplugin_ccodec_internal_headers",
		export_include_dirs: ["."],
		// only for internal tests, perhaps restrict via visibility clause
		}

		cc_library_shared {
		name: "libsfplugin_ccodec",

+3 −6

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ cc_test {
		"libcodec2-internal-defaults",
		],

		include_dirs: [
		"frameworks/av/media/codec2/sfplugin",
		header_libs: [
		"libsfplugin_ccodec_internal_headers",
		],

		shared_libs: [
		@@ -60,13 +60,10 @@ cc_test {
		"MediaCodec_sanity_test.cpp",
		],

		include_dirs: [
		"frameworks/av/media/codec2/sfplugin",
		],

		header_libs: [
		"libmediadrm_headers",
		"libmediametrics_headers",
		"libsfplugin_ccodec_internal_headers",
		],

		shared_libs: [

+0 −4

Original line number	Diff line number	Diff line
		@@ -94,10 +94,6 @@ cc_defaults {
		"libmediabenchmark_soft_sanitize_all-defaults",
		],

		include_dirs: [
		"frameworks/av/media/codec2/hidl/client/include",
		],

		shared_libs: [
		"libcodec2_client",
		"libmediandk",