summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2024-08-27 00:11:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-27 00:11:37 +0000
commitbd22fadef4a565d96e291d92a5bebf28b00b3872 (patch)
tree7d03869005f00af60030322ab386cba68ef2d81a
parent51020fcaaa6cbedd7188666fce6bcf21dfa959d6 (diff)
parentb4fadcfc83be580e144db2b7c59a499eda80d309 (diff)
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>
-rw-r--r--libs/binder/ndk/Android.bp15
1 files changed, 1 insertions, 14 deletions
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index 4e02aceb86..163b5343c0 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -246,19 +246,7 @@ ndk_headers {
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 @@ ndk_library {
first_version: "29",
export_header_libs: [
"libbinder_ndk_headers",
- "libbinder_ndk_helper_headers",
],
}