Use the new more inclusive command-line options.
Test: Compile
Change-Id: I9443541a912a0e9e718650a2349ba540f3f04958
diff --git a/keystore2/aaid/Android.bp b/keystore2/aaid/Android.bp
index d27fdf6..c04ce51 100644
--- a/keystore2/aaid/Android.bp
+++ b/keystore2/aaid/Android.bp
@@ -39,8 +39,8 @@
bindgen_flags: [
"--size_t-is-usize",
- "--whitelist-function=aaid_keystore_attestation_id",
- "--whitelist-var=KEY_ATTESTATION_APPLICATION_ID_MAX_SIZE",
+ "--allowlist-function=aaid_keystore_attestation_id",
+ "--allowlist-var=KEY_ATTESTATION_APPLICATION_ID_MAX_SIZE",
],
}
diff --git a/keystore2/apc_compat/Android.bp b/keystore2/apc_compat/Android.bp
index 9519c8e..bf21675 100644
--- a/keystore2/apc_compat/Android.bp
+++ b/keystore2/apc_compat/Android.bp
@@ -41,12 +41,12 @@
source_stem: "bindings",
bindgen_flags: [
- "--whitelist-function=tryGetUserConfirmationService",
- "--whitelist-function=promptUserConfirmation",
- "--whitelist-function=abortUserConfirmation",
- "--whitelist-function=closeUserConfirmationService",
- "--whitelist-var=INVALID_SERVICE_HANDLE",
- "--whitelist-var=APC_COMPAT_.*",
+ "--allowlist-function=tryGetUserConfirmationService",
+ "--allowlist-function=promptUserConfirmation",
+ "--allowlist-function=abortUserConfirmation",
+ "--allowlist-function=closeUserConfirmationService",
+ "--allowlist-var=INVALID_SERVICE_HANDLE",
+ "--allowlist-var=APC_COMPAT_.*",
],
}
diff --git a/keystore2/src/crypto/Android.bp b/keystore2/src/crypto/Android.bp
index 21c9b74..3ba47cd 100644
--- a/keystore2/src/crypto/Android.bp
+++ b/keystore2/src/crypto/Android.bp
@@ -59,27 +59,27 @@
shared_libs: ["libcrypto"],
bindgen_flags: [
"--size_t-is-usize",
- "--whitelist-function", "randomBytes",
- "--whitelist-function", "AES_gcm_encrypt",
- "--whitelist-function", "AES_gcm_decrypt",
- "--whitelist-function", "CreateKeyId",
- "--whitelist-function", "generateKeyFromPassword",
- "--whitelist-function", "HKDFExtract",
- "--whitelist-function", "HKDFExpand",
- "--whitelist-function", "ECDHComputeKey",
- "--whitelist-function", "ECKEYGenerateKey",
- "--whitelist-function", "ECKEYMarshalPrivateKey",
- "--whitelist-function", "ECKEYParsePrivateKey",
- "--whitelist-function", "EC_KEY_get0_public_key",
- "--whitelist-function", "ECPOINTPoint2Oct",
- "--whitelist-function", "ECPOINTOct2Point",
- "--whitelist-function", "EC_KEY_free",
- "--whitelist-function", "EC_POINT_free",
- "--whitelist-function", "extractSubjectFromCertificate",
- "--whitelist-type", "EC_KEY",
- "--whitelist-type", "EC_POINT",
- "--whitelist-var", "EC_MAX_BYTES",
- "--whitelist-var", "EVP_MAX_MD_SIZE",
+ "--allowlist-function", "randomBytes",
+ "--allowlist-function", "AES_gcm_encrypt",
+ "--allowlist-function", "AES_gcm_decrypt",
+ "--allowlist-function", "CreateKeyId",
+ "--allowlist-function", "generateKeyFromPassword",
+ "--allowlist-function", "HKDFExtract",
+ "--allowlist-function", "HKDFExpand",
+ "--allowlist-function", "ECDHComputeKey",
+ "--allowlist-function", "ECKEYGenerateKey",
+ "--allowlist-function", "ECKEYMarshalPrivateKey",
+ "--allowlist-function", "ECKEYParsePrivateKey",
+ "--allowlist-function", "EC_KEY_get0_public_key",
+ "--allowlist-function", "ECPOINTPoint2Oct",
+ "--allowlist-function", "ECPOINTOct2Point",
+ "--allowlist-function", "EC_KEY_free",
+ "--allowlist-function", "EC_POINT_free",
+ "--allowlist-function", "extractSubjectFromCertificate",
+ "--allowlist-type", "EC_KEY",
+ "--allowlist-type", "EC_POINT",
+ "--allowlist-var", "EC_MAX_BYTES",
+ "--allowlist-var", "EVP_MAX_MD_SIZE",
],
cflags: ["-DBORINGSSL_NO_CXX"],
}
diff --git a/keystore2/src/vintf/Android.bp b/keystore2/src/vintf/Android.bp
index feec8ae..3ab0ec5 100644
--- a/keystore2/src/vintf/Android.bp
+++ b/keystore2/src/vintf/Android.bp
@@ -53,11 +53,11 @@
shared_libs: ["libvintf"],
bindgen_flags: [
"--size_t-is-usize",
- "--whitelist-function", "getHalNames",
- "--whitelist-function", "getHalNamesAndVersions",
- "--whitelist-function", "getHidlInstances",
- "--whitelist-function", "getAidlInstances",
- "--whitelist-function", "freeNames",
+ "--allowlist-function", "getHalNames",
+ "--allowlist-function", "getHalNamesAndVersions",
+ "--allowlist-function", "getHidlInstances",
+ "--allowlist-function", "getAidlInstances",
+ "--allowlist-function", "freeNames",
],
}
diff --git a/keystore2/system_property/Android.bp b/keystore2/system_property/Android.bp
index 5a13c90..9e7b056 100644
--- a/keystore2/system_property/Android.bp
+++ b/keystore2/system_property/Android.bp
@@ -29,9 +29,9 @@
bindgen_flags: [
"--size_t-is-usize",
- "--whitelist-function=__system_property_find",
- "--whitelist-function=__system_property_read_callback",
- "--whitelist-function=__system_property_wait",
+ "--allowlist-function=__system_property_find",
+ "--allowlist-function=__system_property_read_callback",
+ "--allowlist-function=__system_property_wait",
],
}