Shipping_api_level in build.
Add shipping API level to build, so that we can move certain tests to build time. Bug: 340953047 Test: works in init for build time host checks Change-Id: Ic89066c2b49089da3113a1afef1d39de53b307d9
This commit is contained in:
parent
ce15fb72bf
commit
a48df2b7fb
3 changed files with 8 additions and 4 deletions
|
@ -1916,10 +1916,10 @@ func (c *deviceConfig) HostFakeSnapshotEnabled() bool {
|
|||
}
|
||||
|
||||
func (c *deviceConfig) ShippingApiLevel() ApiLevel {
|
||||
if c.config.productVariables.ShippingApiLevel == nil {
|
||||
if c.config.productVariables.Shipping_api_level == nil {
|
||||
return NoneApiLevel
|
||||
}
|
||||
apiLevel, _ := strconv.Atoi(*c.config.productVariables.ShippingApiLevel)
|
||||
apiLevel, _ := strconv.Atoi(*c.config.productVariables.Shipping_api_level)
|
||||
return uncheckedFinalApiLevel(apiLevel)
|
||||
}
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
|
|||
AAPTCharacteristics: stringPtr("nosdcard"),
|
||||
AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"},
|
||||
UncompressPrivAppDex: boolPtr(true),
|
||||
ShippingApiLevel: stringPtr("30"),
|
||||
Shipping_api_level: stringPtr("30"),
|
||||
},
|
||||
|
||||
outDir: buildDir,
|
||||
|
|
|
@ -55,6 +55,10 @@ type variableProperties struct {
|
|||
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
|
||||
// more unbundled branches, usually due to dependencies missing from the manifest.
|
||||
Unbundled_build struct {
|
||||
|
@ -440,7 +444,7 @@ type ProductVariables struct {
|
|||
|
||||
PrebuiltHiddenApiDir *string `json:",omitempty"`
|
||||
|
||||
ShippingApiLevel *string `json:",omitempty"`
|
||||
Shipping_api_level *string `json:",omitempty"`
|
||||
|
||||
BuildBrokenPluginValidation []string `json:",omitempty"`
|
||||
BuildBrokenClangAsFlags bool `json:",omitempty"`
|
||||
|
|
Loading…
Reference in a new issue