Merge "Update fsverity+odsign protos to protobuf3."
diff --git a/diced/open_dice/Android.bp b/diced/open_dice/Android.bp
index 2505b42..45cbb67 100644
--- a/diced/open_dice/Android.bp
+++ b/diced/open_dice/Android.bp
@@ -125,7 +125,6 @@
crate_name: "open_dice_cbor_bindgen",
source_stem: "bindings",
bindgen_flags: [
- "--size_t-is-usize",
"--rustified-enum DiceConfigType",
"--rustified-enum DiceMode",
"--rustified-enum DiceResult",
@@ -177,8 +176,6 @@
crate_name: "open_dice_bcc_bindgen",
source_stem: "bindings",
bindgen_flags: [
- "--size_t-is-usize",
-
// By generating only essential functions, we can make bindings concise and
// optimize compilation time.
"--allowlist-function=BccFormatConfigDescriptor",
diff --git a/keystore2/aaid/Android.bp b/keystore2/aaid/Android.bp
index 3417960..d0a1e77 100644
--- a/keystore2/aaid/Android.bp
+++ b/keystore2/aaid/Android.bp
@@ -38,7 +38,6 @@
source_stem: "bindings",
bindgen_flags: [
- "--size_t-is-usize",
"--allowlist-function=aaid_keystore_attestation_id",
"--allowlist-var=KEY_ATTESTATION_APPLICATION_ID_MAX_SIZE",
],
diff --git a/keystore2/src/crypto/Android.bp b/keystore2/src/crypto/Android.bp
index 1ac6467..35fc5a9 100644
--- a/keystore2/src/crypto/Android.bp
+++ b/keystore2/src/crypto/Android.bp
@@ -69,7 +69,6 @@
vendor_available: true,
shared_libs: ["libcrypto"],
bindgen_flags: [
- "--size_t-is-usize",
"--allowlist-function", "hmacSha256",
"--allowlist-function", "randomBytes",
"--allowlist-function", "AES_gcm_encrypt",
diff --git a/provisioner/Android.bp b/provisioner/Android.bp
index 3b4c4fc..7d3549e 100644
--- a/provisioner/Android.bp
+++ b/provisioner/Android.bp
@@ -77,4 +77,40 @@
"libgflags",
"librkp_factory_extraction",
],
+ dist: {
+ targets: [
+ "dist_files",
+ "rkp_factory_extraction_tool",
+ ],
+ dest: "rkp_factory_extraction_tool"
+ },
+ compile_multilib: "both",
+ multilib: {
+ lib64: {
+ suffix: "64",
+ },
+ },
+ stl: "libc++_static",
+ target: {
+ android_arm: {
+ dist: {
+ dir: "rkp_factory_extraction_tool/arm",
+ },
+ },
+ android_arm64: {
+ dist: {
+ dir: "rkp_factory_extraction_tool/arm64",
+ },
+ },
+ android_x86: {
+ dist: {
+ dir: "rkp_factory_extraction_tool/x86",
+ },
+ },
+ android_x86_64: {
+ dist: {
+ dir: "rkp_factory_extraction_tool/x86_64",
+ },
+ },
+ },
}