| commit | e6210f6eb2bd483118aeab93865bb14485515320 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Feb 25 22:21:24 2019 -0800 |
| committer | Colin Cross <ccross@android.com> | Wed Apr 17 16:50:30 2019 -0700 |
| tree | 0f0ab371b5e8f9a8294c04da7ad40f41ca2f1aa6 | |
| parent | c9bb097beee6bac8d1984d1a7a6c2358223c95ad [diff] [blame] |
Remove AAPT1 support AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index d67c9f8..fafdce6 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk
@@ -291,7 +291,7 @@ LOCAL_UNCOMPRESS_DEX:= LOCAL_UNINSTALLABLE_MODULE:= LOCAL_UNSTRIPPED_PATH:= -LOCAL_USE_AAPT2:=$(USE_AAPT2) +LOCAL_USE_AAPT2:= LOCAL_USE_CLANG_LLD:= LOCAL_USE_VNDK:= LOCAL_USES_LIBRARIES:=