Merge "Revert^2 "remove libbinder_ndk_helper_headers"" into main am: b2653d0b13
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3243189
Change-Id: I742b7b035c38afd22e4fa05f831b45eb20f8b391
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 4e02ace..99f7934 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -218,6 +218,7 @@
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.
@@ -230,9 +231,9 @@
},
apex_available: [
"//apex_available:platform",
- "com.android.media",
- "com.android.media.swcodec",
+ "//apex_available:anyapex",
],
+ sdk_version: "29", // some APEXes require this, good to test headers against old SDK
min_sdk_version: "29",
}
@@ -246,19 +247,7 @@
license: "NOTICE",
}
-// 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,
-}
+// include_cpp are packaged in development/build/sdk.atree with the AIDL compiler
ndk_library {
name: "libbinder_ndk",
@@ -266,6 +255,5 @@
first_version: "29",
export_header_libs: [
"libbinder_ndk_headers",
- "libbinder_ndk_helper_headers",
],
}