Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1388dc6d authored Mar 07, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Mar 07, 2022

Merge "Export header libraries to eliminate include_dirs elsewhere" into tm-dev am: 64c13e05

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17109293

Change-Id: Ibed9db6546de8afcc17b704ac7a38f8e60dc7606

parents 6c499de1 64c13e05

media/codec2/components/avc/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,8 @@ cc_library {
	static_libs: ["libavcdec"],		static_libs: ["libavcdec"],

	srcs: ["C2SoftAvcDec.cpp"],		srcs: ["C2SoftAvcDec.cpp"],

			export_include_dirs: ["."],
	}		}

	cc_library {		cc_library {
	@@ -32,6 +34,8 @@ cc_library {

	srcs: ["C2SoftAvcEnc.cpp"],		srcs: ["C2SoftAvcEnc.cpp"],

			export_include_dirs: ["."],

	cflags: [		cflags: [
	"-Wno-unused-variable",		"-Wno-unused-variable",
	],		],

media/codec2/components/base/Android.bp

+10 −0

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

			cc_library_headers {
			name: "libcodec2_soft_common_headers",
			defaults: ["libcodec2-impl-defaults"],
			vendor_available: true,

			export_include_dirs: [
			"include",
			],
			}

	cc_library {		cc_library {
	name: "libcodec2_soft_common",		name: "libcodec2_soft_common",
	defaults: ["libcodec2-impl-defaults"],		defaults: ["libcodec2-impl-defaults"],

media/codec2/sfplugin/utils/Android.bp

+11 −0

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

			cc_library_headers {
			name: "libsfplugin_ccodec_utils_headers",
			vendor_available: true,
			min_sdk_version: "29",
			apex_available: [ "//apex_available:platform", "com.android.media.swcodec", ],

			export_include_dirs: [
			".",
			],
			}

	cc_library {		cc_library {
	name: "libsfplugin_ccodec_utils",		name: "libsfplugin_ccodec_utils",
	vendor_available: true,		vendor_available: true,