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 /java/app.go | |
| 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 'java/app.go')
| -rw-r--r-- | java/app.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go index c94d22f0..0db48e76 100644 --- a/java/app.go +++ b/java/app.go @@ -283,7 +283,7 @@ func (a *AndroidApp) aapt2Flags(ctx android.ModuleContext) (flags []string, deps sdkVersion := String(a.deviceProperties.Sdk_version) switch sdkVersion { case "", "current", "system_current", "test_current": - sdkVersion = proptools.NinjaEscape([]string{ctx.Config().AppsDefaultVersionName()})[0] + sdkVersion = proptools.NinjaEscape([]string{ctx.Config().DefaultAppTargetSdk()})[0] } linkFlags = append(linkFlags, "--min-sdk-version "+sdkVersion) |