move include_dirs to header_libs, declare apex accessibility
Bug: 201944383
Bug: 215589022
Test: build, boot
Change-Id: I5a25b23eebb096f1d9950bcb8f7f2f73b7b5a35d
diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp
index 27cd1f8..598500d 100644
--- a/media/codec2/vndk/Android.bp
+++ b/media/codec2/vndk/Android.bp
@@ -18,6 +18,25 @@
vendor_available: true,
min_sdk_version: "29",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media.swcodec",
+ ],
+
+}
+
+cc_library_headers {
+ name: "libcodec2_vndk_headers",
+ vendor_available: true,
+ min_sdk_version: "29",
+
+ export_include_dirs: [
+ "include",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media.swcodec",
+ ],
}
// !!!DO NOT DEPEND ON THIS SHARED LIBRARY DIRECTLY!!!
@@ -28,6 +47,11 @@
min_sdk_version: "29",
// TODO: b/147147883
double_loadable: true,
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media.swcodec",
+ ],
+
srcs: [
"C2AllocatorBlob.cpp",