commit 3b3aac0088469c6b0985b319028c48fd3b8d7d92
author Bill Yang <yangbill@google.com> Thu Sep 05 09:22:09 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 05 09:22:10 2024 +0000
tree 896118e1fb92b274d9a665b29a2d8b30545098db
parent 1558cc68ec8f082df3a9ac5857f2236ab56ff5cd

Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for..."

Revert submission 3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Reason for revert: The root cause of the break is already be merged. Related changes: ag/29139095, ag/29139608

Reverted changes: /q/submissionid:3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Change-Id: Ie23bdd343bebbd077553dc25f0bfd13539daf57a

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index a715e0e..97aa809 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -511,6 +511,11 @@
 	SystemPropFiles []string `json:",omitempty"`
 
 	EnableUffdGc *string `json:",omitempty"`
+
+	BoardAvbEnable                         *bool    `json:",omitempty"`
+	BoardAvbSystemAddHashtreeFooterArgs    []string `json:",omitempty"`
+	DeviceFrameworkCompatibilityMatrixFile []string `json:",omitempty"`
+	DeviceProductCompatibilityMatrixFile   []string `json:",omitempty"`
 }
 
 type PartitionQualifiedVariablesType struct {