diff options
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go index 1c81f3c3d..7fb81b905 100644 --- a/android/variable.go +++ b/android/variable.go @@ -95,6 +95,10 @@ type variableProperties struct { Cflags []string } + Device_page_size_agnostic struct { + Cflags []string `android:"arch_variant"` + } `android:"arch_variant"` + Override_rs_driver struct { Cflags []string } @@ -180,6 +184,13 @@ type variableProperties struct { Srcs []string `android:"arch_variant"` Exclude_srcs []string `android:"arch_variant"` } `android:"arch_variant"` + + // release_aidl_use_unfrozen is "true" when a device can + // use the unfrozen versions of AIDL interfaces. + Release_aidl_use_unfrozen struct { + Cflags []string + Cmd *string + } } `android:"arch_variant"` } @@ -275,6 +286,7 @@ type ProductVariables struct { Safestack *bool `json:",omitempty"` HostStaticBinaries *bool `json:",omitempty"` Binder32bit *bool `json:",omitempty"` + Device_page_size_agnostic *bool `json:",omitempty"` UseGoma *bool `json:",omitempty"` UseRBE *bool `json:",omitempty"` UseRBEJAVAC *bool `json:",omitempty"` @@ -457,6 +469,8 @@ type ProductVariables struct { SelinuxIgnoreNeverallows bool `json:",omitempty"` + Release_aidl_use_unfrozen *bool `json:",omitempty"` + SepolicyFreezeTestExtraDirs []string `json:",omitempty"` SepolicyFreezeTestExtraPrebuiltDirs []string `json:",omitempty"` @@ -529,6 +543,7 @@ func (v *ProductVariables) SetDefaultConfig() { Safestack: boolPtr(false), TrimmedApex: boolPtr(false), Build_from_text_stub: boolPtr(false), + Device_page_size_agnostic: boolPtr(false), BootJars: ConfiguredJarList{apexes: []string{}, jars: []string{}}, ApexBootJars: ConfiguredJarList{apexes: []string{}, jars: []string{}}, @@ -728,7 +743,9 @@ func (p *ProductConfigProperties) AddEitherProperty( dst = append(dst, src...) (*p)[propertyName][key] = dst default: - panic(fmt.Errorf("TODO: handle merging value %#v", existing)) + if existing != propertyValue { + panic(fmt.Errorf("TODO: handle merging value %#v", existing)) + } } } else { (*p)[propertyName][key] = propertyValue @@ -941,7 +958,7 @@ func (productConfigProperties *ProductConfigProperties) AddSoongConfigProperties productConfigProperties.AddSoongConfigProperty(propertyName, namespace, soongConfigVariableName, soongConfigVariableValue, os.Name, property.Interface()) } } - } else { + } else if !archOrOsSpecificStruct.IsZero() { // One problem with supporting additional fields is that if multiple branches of // "target" overlap, we don't want them to be in the same select statement (aka // configuration axis). "android" and "host" are disjoint, so it's ok that we only |