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:39:25 -0700 |
| commit | d09b0b653b615c322266fa2a41ecf0f0066bc93d (patch) | |
| tree | 10a05fb4da8397627f9258b33e397cecd44e4796 /android/variable.go | |
| parent | a140bb05f1eeafe046574454debd190c32e09888 (diff) | |
| download | build_soong-d09b0b653b615c322266fa2a41ecf0f0066bc93d.tar.gz build_soong-d09b0b653b615c322266fa2a41ecf0f0066bc93d.tar.bz2 build_soong-d09b0b653b615c322266fa2a41ecf0f0066bc93d.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
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/variable.go b/android/variable.go index 3eee9887..20579033 100644 --- a/android/variable.go +++ b/android/variable.go @@ -110,6 +110,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"` |