summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joel Galenson <jgalenson@google.com> 2021-04-19 21:21:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-19 21:21:27 +0000
commite86260a3534ffde8c5c39fdf8953db5db4677f94 (patch)
treeae982cf70112cc5661a30f43bbb8c8a9a721c68d
parentbf8ed6e10188ce7b4f8f22f7a2ee8c9eeafca018 (diff)
parent0de07374fdacd97ed86b8203714947edb817b99d (diff)
Merge "Use the new more inclusive command-line options." am: 8e14fec0c8 am: 0de07374fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1679309 Change-Id: I9b41669671ba38b6f57d667c930c651be41b8eaf
-rw-r--r--libs/binder/rust/Android.bp18
-rw-r--r--libs/binder/rust/tests/Android.bp4
2 files changed, 11 insertions, 11 deletions
diff --git a/libs/binder/rust/Android.bp b/libs/binder/rust/Android.bp
index e12a429cf9..57c9013f60 100644
--- a/libs/binder/rust/Android.bp
+++ b/libs/binder/rust/Android.bp
@@ -65,15 +65,15 @@ rust_bindgen {
// rustified
"--constified-enum", "android::c_interface::consts::.*",
- "--whitelist-type", "android::c_interface::.*",
- "--whitelist-type", "AStatus",
- "--whitelist-type", "AIBinder_Class",
- "--whitelist-type", "AIBinder",
- "--whitelist-type", "AIBinder_Weak",
- "--whitelist-type", "AIBinder_DeathRecipient",
- "--whitelist-type", "AParcel",
- "--whitelist-type", "binder_status_t",
- "--whitelist-function", ".*",
+ "--allowlist-type", "android::c_interface::.*",
+ "--allowlist-type", "AStatus",
+ "--allowlist-type", "AIBinder_Class",
+ "--allowlist-type", "AIBinder",
+ "--allowlist-type", "AIBinder_Weak",
+ "--allowlist-type", "AIBinder_DeathRecipient",
+ "--allowlist-type", "AParcel",
+ "--allowlist-type", "binder_status_t",
+ "--allowlist-function", ".*",
],
shared_libs: [
"libbinder_ndk",
diff --git a/libs/binder/rust/tests/Android.bp b/libs/binder/rust/tests/Android.bp
index 0bf76c696a..607860f462 100644
--- a/libs/binder/rust/tests/Android.bp
+++ b/libs/binder/rust/tests/Android.bp
@@ -114,8 +114,8 @@ rust_bindgen {
source_stem: "bindings",
cpp_std: "gnu++17",
bindgen_flags: [
- "--whitelist-type", "Transaction",
- "--whitelist-var", "TESTDATA_.*",
+ "--allowlist-type", "Transaction",
+ "--allowlist-var", "TESTDATA_.*",
],
shared_libs: [