| commit | 85f2b4a68000b84762fc6f9ae4af3b9f14287c37 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Apr 18 10:20:49 2019 -0700 |
| committer | Colin Cross <ccross@android.com> | Thu Apr 18 11:14:58 2019 -0700 |
| tree | 7a9b4fa0b76fc442c58b9e6f2d6c464887f21fb4 | |
| parent | e6210f6eb2bd483118aeab93865bb14485515320 [diff] |
Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current Removing AAPT1 support removed the distinction between unset LOCAL_USE_AAPT2 and LOCAL_USE_AAPT2 := true, which enabled the LCOAL_SDK_RES_VERSION setting for some modules that had previously bypassed it because of LOCAL_USE_AAPT2 := true. The workaround was too broad, it shouldn't apply if LOCAL_SDK_VERSION is already set to *current. In particular, if it is core_current to disable using framework-res.apk completely, then LOCAL_SDK_RES_VERSION must not be set to current. Fixes: 130782219 Test: atest android.server.wm.PrereleaseSdkTest Change-Id: I250d65b1ef66e591f2c9779580df4cc3f0f2b028
This is the Makefile-based portion of the Android Build System.
For documentation on how to run a build, see Usage.txt
For a list of behavioral changes useful for Android.mk writers see Changes.md
For an outdated reference on Android.mk files, see build-system.html. Our Android.mk files look similar, but are entirely different from the Android.mk files used by the NDK build system. When searching for documentation elsewhere, ensure that it is for the platform build system -- most are not.
This Makefile-based system is in the process of being replaced with Soong, a new build system written in Go. During the transition, all of these makefiles are read by Kati, and generate a ninja file instead of being executed directly. That's combined with a ninja file read by Soong so that the build graph of the two systems can be combined and run as one.