Migrate to new open-dice API for Android
Symbols for Android in open-dice now use the DiceAndroid* prefix rather
than the Bcc* prefix. This does not migrate the whole library away from
the legacy BCC nomencalture.
Test: TH
Change-Id: I878de15f663ee2bcb678db12475cae6c45fc8b87
diff --git a/diced/open_dice/Android.bp b/diced/open_dice/Android.bp
index c59419b..3d904ea 100644
--- a/diced/open_dice/Android.bp
+++ b/diced/open_dice/Android.bp
@@ -13,7 +13,7 @@
name: "libdiced_open_dice_nostd",
defaults: ["libdiced_open_dice_defaults"],
rustlibs: [
- "libopen_dice_bcc_bindgen_nostd",
+ "libopen_dice_android_bindgen_nostd",
"libopen_dice_cbor_bindgen_nostd",
"libzeroize_nostd",
],
@@ -31,7 +31,7 @@
defaults: ["libdiced_open_dice_defaults"],
vendor_available: true,
rustlibs: [
- "libopen_dice_bcc_bindgen",
+ "libopen_dice_android_bindgen",
"libopen_dice_cbor_bindgen",
"libzeroize",
],
@@ -45,7 +45,7 @@
"libopen_dice_cbor",
],
whole_static_libs: [
- "libopen_dice_bcc",
+ "libopen_dice_android",
],
visibility: [
"//system/security/diced:__subpackages__",
@@ -172,22 +172,22 @@
}
rust_defaults {
- name: "libopen_dice_bcc_bindgen.rust_defaults",
- wrapper_src: "bindgen/android/bcc.h",
- crate_name: "open_dice_bcc_bindgen",
+ name: "libopen_dice_android_bindgen.rust_defaults",
+ wrapper_src: "bindgen/android.h",
+ crate_name: "open_dice_android_bindgen",
source_stem: "bindings",
bindgen_flags: [
// By generating only essential functions, we can make bindings concise and
// optimize compilation time.
- "--allowlist-function=BccFormatConfigDescriptor",
- "--allowlist-function=BccMainFlow",
- "--allowlist-function=BccHandoverMainFlow",
- "--allowlist-function=BccHandoverParse",
+ "--allowlist-function=DiceAndroidFormatConfigDescriptor",
+ "--allowlist-function=DiceAndroidMainFlow",
+ "--allowlist-function=DiceAndroidHandoverMainFlow",
+ "--allowlist-function=DiceAndroidHandoverParse",
// We also need some constants in addition to the functions.
- "--allowlist-var=BCC_INPUT_COMPONENT_NAME",
- "--allowlist-var=BCC_INPUT_COMPONENT_VERSION",
- "--allowlist-var=BCC_INPUT_RESETTABLE",
+ "--allowlist-var=DICE_ANDROID_CONFIG_COMPONENT_NAME",
+ "--allowlist-var=DICE_ANDROID_CONFIG_COMPONENT_VERSION",
+ "--allowlist-var=DICE_ANDROID_CONFIG_RESETTABLE",
// Prevent DiceInputValues from being generated a second time and
// import it instead from open_dice_cbor_bindgen.
@@ -206,27 +206,27 @@
}
rust_bindgen {
- name: "libopen_dice_bcc_bindgen",
+ name: "libopen_dice_android_bindgen",
defaults: [
"libopen_dice.rust_defaults",
- "libopen_dice_bcc_bindgen.rust_defaults",
+ "libopen_dice_android_bindgen.rust_defaults",
],
rustlibs: [
"libopen_dice_cbor_bindgen",
],
- whole_static_libs: ["libopen_dice_bcc"],
+ whole_static_libs: ["libopen_dice_android"],
}
rust_bindgen {
- name: "libopen_dice_bcc_bindgen_nostd",
+ name: "libopen_dice_android_bindgen_nostd",
defaults: [
- "libopen_dice_bcc_bindgen.rust_defaults",
+ "libopen_dice_android_bindgen.rust_defaults",
"libopen_dice_bindgen_nostd.rust_defaults",
],
rustlibs: [
"libopen_dice_cbor_bindgen_nostd",
],
- whole_static_libs: ["libopen_dice_bcc_baremetal"],
+ whole_static_libs: ["libopen_dice_android_baremetal"],
}
rust_test {
@@ -242,11 +242,11 @@
}
rust_test {
- name: "libopen_dice_bcc_bindgen_test",
+ name: "libopen_dice_android_bindgen_test",
srcs: [
- ":libopen_dice_bcc_bindgen",
+ ":libopen_dice_android_bindgen",
],
- crate_name: "open_dice_bcc_bindgen_test",
+ crate_name: "open_dice_android_bindgen_test",
rustlibs: [
"libopen_dice_cbor_bindgen",
],