| commit | d1c9bfe87a25dc534ecd7ea23b1053cb6fbbfe38 | [log] [tgz] |
|---|---|---|
| author | Ulya Trafimovich <skvadrik@google.com> | Mon Jan 06 13:50:55 2020 +0000 |
| committer | Ulya Trafimovich <skvadrik@google.com> | Mon Jan 06 15:58:52 2020 +0000 |
| tree | 25894d171da0cca142b9d24a89b04b19ca2689d5 | |
| parent | 9d4a90ef4bc8270fc52c075a34c007acd1b0a6c3 [diff] |
Respect JIT-zygote config when generating boot image location. Earlier CL Ida40dfae8c83bf7c2e737d5c7ea418e1197ad826 introduced Soong-generated Make variable 'DEXPREOPT_IMAGE_LOCATIONS'. That CL was erroneous in that it did not take JIT-zygote config into account and generated identical location for "boot" and "apex" boot images. This caused build breakages, because in case of JIT-zygote config the two variables 'DexPreoptImages' and 'DexPreoptImageLocations' in the module's dexpreopt.config were out of sync: 'DexPreoptImages' was for the "apex" image, and 'DexPreoptImageLocations' was for the "boot" image. CL I9a91fc48e54d7d43abec2cb2b5a11e3581db380b introduced a workaround for this problem: incorrect 'DexPreoptImageLocations' from the module dexpreopt.config was ignored, and instead boot image location was manually reconstructed from 'DexPreoptImages'. This workaround would not work when we start using boot image extension and location will become more complex. This CL fixes the way 'DexPreoptImageLocations' is generated by spliting the 'DEXPREOPT_IMAGE_LOCATIONS' variable in two variables depending on the boot image flavour "boot" of "apex". This is aligned with the way other similar variables are generated. Test: aosp_walleye-userdebug boots. Test: walleye_jitzygote-userdebug builds (on git_rvc-release branch with this CL cherry-picked). Change-Id: I449c968909635dd8cc431323fccbc7fce440fea5
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.