summaryrefslogtreecommitdiff
path: root/android/variable.go
diff options
context:
space:
mode:
Diffstat (limited to 'android/variable.go')
-rw-r--r--android/variable.go13
1 files changed, 9 insertions, 4 deletions
diff --git a/android/variable.go b/android/variable.go
index 557b0b70f..fbab93b7a 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -424,10 +424,10 @@ type ProductVariables struct {
TargetFSConfigGen []string `json:",omitempty"`
- EnforceProductPartitionInterface *bool `json:",omitempty"`
+ UseSoongSystemImage *bool `json:",omitempty"`
+ ProductSoongDefinedSystemImage *string `json:",omitempty"`
- EnforceInterPartitionJavaSdkLibrary *bool `json:",omitempty"`
- InterPartitionJavaLibraryAllowList []string `json:",omitempty"`
+ EnforceProductPartitionInterface *bool `json:",omitempty"`
BoardUsesRecoveryAsBoot *bool `json:",omitempty"`
@@ -521,6 +521,10 @@ type ProductVariables struct {
BoardAvbSystemAddHashtreeFooterArgs []string `json:",omitempty"`
DeviceFrameworkCompatibilityMatrixFile []string `json:",omitempty"`
DeviceProductCompatibilityMatrixFile []string `json:",omitempty"`
+
+ PartitionVarsForSoongMigrationOnlyDoNotUse PartitionVariables
+
+ ExtraAllowedDepsTxt *string `json:",omitempty"`
}
type PartitionQualifiedVariablesType struct {
@@ -577,7 +581,8 @@ type PartitionVariables struct {
BoardAvbEnable bool `json:",omitempty"`
- ProductPackages []string `json:",omitempty"`
+ ProductPackages []string `json:",omitempty"`
+ ProductPackagesDebug []string `json:",omitempty"`
}
func boolPtr(v bool) *bool {