Merge "Sandbox libbssl_sys_src_nostd" into main
diff --git a/filesystem/vbmeta.go b/filesystem/vbmeta.go
index 63e0aba..43a2f37 100644
--- a/filesystem/vbmeta.go
+++ b/filesystem/vbmeta.go
@@ -63,6 +63,17 @@
// List of chained partitions that this vbmeta deletages the verification.
Chained_partitions []chainedPartitionProperties
+
+ // List of key-value pair of avb properties
+ Avb_properties []avbProperty
+}
+
+type avbProperty struct {
+ // Key of given avb property
+ Key *string
+
+ // Value of given avb property
+ Value *string
}
type chainedPartitionProperties struct {
@@ -135,6 +146,20 @@
}
cmd.FlagWithArg("--rollback_index_location ", strconv.Itoa(ril))
+ for _, avb_prop := range v.properties.Avb_properties {
+ key := proptools.String(avb_prop.Key)
+ if key == "" {
+ ctx.PropertyErrorf("avb_properties", "key must be specified")
+ continue
+ }
+ value := proptools.String(avb_prop.Value)
+ if value == "" {
+ ctx.PropertyErrorf("avb_properties", "value must be specified")
+ continue
+ }
+ cmd.FlagWithArg("--prop ", key+":"+value)
+ }
+
for _, p := range ctx.GetDirectDepsWithTag(vbmetaPartitionDep) {
f, ok := p.(Filesystem)
if !ok {
diff --git a/genrule/allowlists.go b/genrule/allowlists.go
index 823364a..9e37a09 100644
--- a/genrule/allowlists.go
+++ b/genrule/allowlists.go
@@ -43,8 +43,6 @@
"libc_musl_sysroot_bits",
"libcore-non-cts-tests-txt",
"pvmfw_fdt_template_rs",
- "r8retrace-dexdump-sample-app",
- "r8retrace-run-retrace",
"seller-frontend-service-stub-lite",
"swiftshader_spvtools_update_build_version",
"ue_unittest_erofs_imgs",