StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Shipping_api_level in build." into main

Browse Source
This commit is contained in:
Steven Moreland
2024-06-05 19:23:20 +00:00
committed by Gerrit Code Review
parent 6c9fa02204 a48df2b7fb
commit c562e50fe5
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1912,10 +1912,10 @@ func (c *deviceConfig) HostFakeSnapshotEnabled() bool {
} }
func (c *deviceConfig) ShippingApiLevel() ApiLevel { func (c *deviceConfig) ShippingApiLevel() ApiLevel {
if c.config.productVariables.ShippingApiLevel == nil { if c.config.productVariables.Shipping_api_level == nil {
return NoneApiLevel return NoneApiLevel
} }
apiLevel, _ := strconv.Atoi(*c.config.productVariables.ShippingApiLevel) apiLevel, _ := strconv.Atoi(*c.config.productVariables.Shipping_api_level)
return uncheckedFinalApiLevel(apiLevel) return uncheckedFinalApiLevel(apiLevel)
} }

2
android/test_config.go
View File

@@ -50,7 +50,7 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
AAPTCharacteristics: stringPtr("nosdcard"), AAPTCharacteristics: stringPtr("nosdcard"),
AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"}, AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"},
UncompressPrivAppDex: boolPtr(true), UncompressPrivAppDex: boolPtr(true),
ShippingApiLevel: stringPtr("30"), Shipping_api_level: stringPtr("30"),
}, },
outDir: buildDir, outDir: buildDir,

6
android/variable.go
View File

@@ -55,6 +55,10 @@ type variableProperties struct {
Base_dir *string Base_dir *string
} }
Shipping_api_level struct {
Cflags []string
}
// unbundled_build is a catch-all property to annotate modules that don't build in one or // unbundled_build is a catch-all property to annotate modules that don't build in one or
// more unbundled branches, usually due to dependencies missing from the manifest. // more unbundled branches, usually due to dependencies missing from the manifest.
Unbundled_build struct { Unbundled_build struct {
@@ -440,7 +444,7 @@ type ProductVariables struct {
PrebuiltHiddenApiDir *string `json:",omitempty"` PrebuiltHiddenApiDir *string `json:",omitempty"`
ShippingApiLevel *string `json:",omitempty"` Shipping_api_level *string `json:",omitempty"`
BuildBrokenPluginValidation []string `json:",omitempty"` BuildBrokenPluginValidation []string `json:",omitempty"`
BuildBrokenClangAsFlags bool `json:",omitempty"` BuildBrokenClangAsFlags bool `json:",omitempty"`