diff options
| author | Colin Cross <ccross@android.com> | 2017-12-02 16:14:26 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-12-03 00:26:39 +0000 |
| commit | 42f3a76f0098b26029d9f8906b3085219d48ee36 (patch) | |
| tree | 48e62cb7b7a755ed2c645acd8d0d8d6f806f667a /java/config | |
| parent | 61ae0b7eedf030cb482aa3e3c2a0ae6db1aed840 (diff) | |
| download | build_soong-42f3a76f0098b26029d9f8906b3085219d48ee36.tar.gz build_soong-42f3a76f0098b26029d9f8906b3085219d48ee36.tar.bz2 build_soong-42f3a76f0098b26029d9f8906b3085219d48ee36.zip | |
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
Diffstat (limited to 'java/config')
| -rw-r--r-- | java/config/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/config/config.go b/java/config/config.go index 603d43fe..ad2f0aee 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") } |