diff options
| author | Colin Cross <ccross@android.com> | 2018-04-18 11:06:47 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-04-18 12:48:02 -0700 |
| commit | e20c1b19045c880e6dfe6bce7c00e7bce0c20318 (patch) | |
| tree | d4b502de08bfbe9fa12d35e62cf654fdd8f75fc1 /android | |
| parent | 8328367c44085b948c003116c0ed74a047237a69 (diff) | |
| download | build_soong-e20c1b19045c880e6dfe6bce7c00e7bce0c20318.tar.gz build_soong-e20c1b19045c880e6dfe6bce7c00e7bce0c20318.tar.bz2 build_soong-e20c1b19045c880e6dfe6bce7c00e7bce0c20318.zip | |
Fix aapt2 --min-sdk-version after finalized SDK
aapt2 --min-sdk-version was using AppsDefaultVersionName(), which
is OMR1 for a non-finalized SDK, but 8.1.0 after finalization.
Add PlatformSdkCodename() for non-finalized SDKs, use it for
DefaultAppTargetSdk(), and pass it for aapt2 --min-sdk-version.
Bug: 78224641
Test: TestAppSdkVersion in app_test.go
Change-Id: I622eaf92f8a940f79007c2a579536da325700b06
Merged-In: I622eaf92f8a940f79007c2a579536da325700b06
(cherry picked from commit d09b0b653b615c322266fa2a41ecf0f0066bc93d)
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 12 | ||||
| -rw-r--r-- | android/variable.go | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index b89ae488..549abe91 100644 --- a/android/config.go +++ b/android/config.go @@ -476,6 +476,10 @@ func (c *config) PlatformSdkVersion() string { return strconv.Itoa(c.PlatformSdkVersionInt()) } +func (c *config) PlatformSdkCodename() string { + return String(c.productVariables.Platform_sdk_codename) +} + func (c *config) MinSupportedSdkVersion() int { return 14 } @@ -488,6 +492,14 @@ func (c *config) DefaultAppTargetSdkInt() int { } } +func (c *config) DefaultAppTargetSdk() string { + if Bool(c.productVariables.Platform_sdk_final) { + return c.PlatformSdkVersion() + } else { + return c.PlatformSdkCodename() + } +} + func (c *config) AppsDefaultVersionName() string { return String(c.productVariables.AppsDefaultVersionName) } diff --git a/android/variable.go b/android/variable.go index a386b9df..9d9830ea 100644 --- a/android/variable.go +++ b/android/variable.go @@ -128,6 +128,7 @@ type productVariables struct { DateFromFile *string `json:",omitempty"` Platform_sdk_version *int `json:",omitempty"` + Platform_sdk_codename *string `json:",omitempty"` Platform_sdk_final *bool `json:",omitempty"` Platform_version_active_codenames []string `json:",omitempty"` Platform_version_future_codenames []string `json:",omitempty"` |