Merge "[attestation] Build the certificate output for attestation" into main
diff --git a/libs/apexutil/Android.bp b/libs/apexutil/Android.bp
index 92d4e80..f9b72c4 100644
--- a/libs/apexutil/Android.bp
+++ b/libs/apexutil/Android.bp
@@ -6,7 +6,6 @@
name: "libapexutil_rust.defaults",
crate_name: "apexutil",
defaults: ["avf_build_flags_rust"],
- host_supported: true,
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
@@ -31,14 +30,4 @@
rustlibs: [
"libhex",
],
- target: {
- host: {
- // TODO(b/204562227): remove once the build does this automatically
- data_libs: [
- "libc++",
- "libcrypto",
- "libz",
- ],
- },
- },
}
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index c93cb4c..b42e416 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -410,6 +410,16 @@
partitions: ["microdroid_vendor"],
},
},
+ // TODO(b/312809093): Remove hard-coded property after figuring out the
+ // long-term solution for microdroid vendor partition SPL. The hard-coded
+ // value is the minimum value of SPL that microdroid vendor partition will
+ // have. It's for passing the check 'IsStandaloneImageRollback'.
+ avb_properties: [
+ {
+ key: "com.android.build.microdroid-vendor.security_patch",
+ value: "2023-12-05",
+ },
+ ],
}
prebuilt_etc {