Merge "remove libbinder_ndk_helper_headers" into main am: 630aa07131 am: b4fadcfc83
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3243641
Change-Id: I379a279e07724d34cb8552924eac75a3d0ee7e00
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..163b534 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -246,19 +246,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 +254,5 @@
first_version: "29",
export_header_libs: [
"libbinder_ndk_headers",
- "libbinder_ndk_helper_headers",
],
}