Merge "Revert^3 "remove libbinder_ndk_helper_headers"" into main am: 754cf33bce
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3248095
Change-Id: Iff232e74abad2016996166f71d4f53864560a1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index 99f7934..4e02ace 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -218,7 +218,6 @@
name: "libbinder_headers_platform_shared",
export_include_dirs: ["include_cpp"],
vendor_available: true,
- product_available: true,
recovery_available: true,
host_supported: true,
// TODO(b/153609531): remove when no longer needed.
@@ -231,9 +230,9 @@
},
apex_available: [
"//apex_available:platform",
- "//apex_available:anyapex",
+ "com.android.media",
+ "com.android.media.swcodec",
],
- sdk_version: "29", // some APEXes require this, good to test headers against old SDK
min_sdk_version: "29",
}
@@ -247,7 +246,19 @@
license: "NOTICE",
}
-// include_cpp are packaged in development/build/sdk.atree with the AIDL compiler
+// TODO(b/160624671): package with the aidl compiler
+ndk_headers {
+ name: "libbinder_ndk_helper_headers",
+ from: "include_cpp/android",
+ to: "android",
+ srcs: [
+ "include_cpp/android/*.h",
+ ],
+ license: "NOTICE",
+ // These are intentionally not C. It's a mistake that they're in the NDK.
+ // See the bug above.
+ skip_verification: true,
+}
ndk_library {
name: "libbinder_ndk",
@@ -255,5 +266,6 @@
first_version: "29",
export_header_libs: [
"libbinder_ndk_headers",
+ "libbinder_ndk_helper_headers",
],
}