From 42f3a76f0098b26029d9f8906b3085219d48ee36 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Sat, 2 Dec 2017 16:14:26 -0800 Subject: [PATCH] Fix apps build Fix two problems with Soong's aapt2 rules that occur when TARGET_BUILD_APPS is set. Fix escaping the values passed to --min-sdk-version, they are sometimes P-$$(cat out/build_number.txt). Also use the correct path to the aapt2 prebuilt. Bug: 69917341 Test: m TARGET_PRODUCT=full TARGET_BUILD_VARIANT=userdebug TARGET_BUILD_APPS=Camera2 Change-Id: I8660a62c4a87a74e0ac1b9d03d67103af93a0cbe --- java/app.go | 2 +- java/config/config.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/app.go b/java/app.go index 6866e2a83..ed6a9db57 100644 --- a/java/app.go +++ b/java/app.go @@ -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) diff --git a/java/config/config.go b/java/config/config.go index 603d43fe1..ad2f0aee1 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -147,5 +147,5 @@ func init() { }) } - hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilt/sdk/tools", "aapt2") + hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilts/sdk/tools", "aapt2") }