tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix apps build

Browse source 
am: 42f3a76f00

Change-Id: I335bfc9b17f3564e1d4714706983406374994e7d
This commit is contained in:
Colin Cross 2017-12-03 02:13:20 +00:00 committed by android-build-merger
commit ad843bce95
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/app.go
View file

@ -254,7 +254,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 = ctx.Config().AppsDefaultVersionName()
sdkVersion = proptools.NinjaEscape([]string{ctx.Config().AppsDefaultVersionName()})[0]
}
linkFlags = append(linkFlags, "--min-sdk-version "+sdkVersion)

2
java/config/config.go
View file

@ -147,5 +147,5 @@ func init() {
})
}
hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilt/sdk/tools", "aapt2")
hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilts/sdk/tools", "aapt2")
}