Replace include_dirs with header_libs
Cleaning out cross-module pathnames.
Bug: 201944383
Test: build
Change-Id: Ie6fca5233dc7c22ae19ee6d56065e86257c001ea
diff --git a/media/codec2/hidl/1.0/vts/functional/common/Android.bp b/media/codec2/hidl/1.0/vts/functional/common/Android.bp
index 4106be8..be4bafa 100644
--- a/media/codec2/hidl/1.0/vts/functional/common/Android.bp
+++ b/media/codec2/hidl/1.0/vts/functional/common/Android.bp
@@ -14,8 +14,8 @@
"libcodec2-hidl-client-defaults",
],
- include_dirs: [
- "frameworks/av/media/codec2/hidl/client/include",
+ header_libs: [
+ "libcodec2_client_headers",
],
srcs: [
diff --git a/media/codec2/hidl/client/Android.bp b/media/codec2/hidl/client/Android.bp
index 0e52813..f32711d 100644
--- a/media/codec2/hidl/client/Android.bp
+++ b/media/codec2/hidl/client/Android.bp
@@ -7,6 +7,24 @@
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",
diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp
index feeddb5..a73b493 100644
--- a/media/codec2/sfplugin/Android.bp
+++ b/media/codec2/sfplugin/Android.bp
@@ -7,6 +7,12 @@
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",
diff --git a/media/codec2/sfplugin/tests/Android.bp b/media/codec2/sfplugin/tests/Android.bp
index 92f3754..246e563 100644
--- a/media/codec2/sfplugin/tests/Android.bp
+++ b/media/codec2/sfplugin/tests/Android.bp
@@ -23,8 +23,8 @@
"libcodec2-internal-defaults",
],
- include_dirs: [
- "frameworks/av/media/codec2/sfplugin",
+ header_libs: [
+ "libsfplugin_ccodec_internal_headers",
],
shared_libs: [
@@ -60,13 +60,10 @@
"MediaCodec_sanity_test.cpp",
],
- include_dirs: [
- "frameworks/av/media/codec2/sfplugin",
- ],
-
header_libs: [
"libmediadrm_headers",
"libmediametrics_headers",
+ "libsfplugin_ccodec_internal_headers",
],
shared_libs: [
diff --git a/media/tests/benchmark/src/native/common/Android.bp b/media/tests/benchmark/src/native/common/Android.bp
index 718d217..7988979 100644
--- a/media/tests/benchmark/src/native/common/Android.bp
+++ b/media/tests/benchmark/src/native/common/Android.bp
@@ -94,10 +94,6 @@
"libmediabenchmark_soft_sanitize_all-defaults",
],
- include_dirs: [
- "frameworks/av/media/codec2/hidl/client/include",
- ],
-
shared_libs: [
"libcodec2_client",
"libmediandk",