Merge "Shipping_api_level in build." into main am: c562e50fe5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112267 Change-Id: Ieae74f8a9f904cbdffd05ccc88bce407a25b703a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1908,10 +1908,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)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user