p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
platform_build/core/dex_preopt.mk

34 lines
1.5 KiB
Makefile
Raw Normal View History

Integrate dexpreopt into the build system. Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-18 07:36:06 +08:00
####################################
Add DEXPREOPT support for ART Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-11-15 15:44:56 +08:00
# dexpreopt support - typically used on user builds to run dexopt (for Dalvik) or dex2oat (for ART) ahead of time
Integrate dexpreopt into the build system. Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-18 07:36:06 +08:00
#
####################################
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 13:26:33 +08:00
include $(BUILD_SYSTEM)/dex_preopt_config.mk
Add system_other partition, install odex files For AB devices, support flashing two system partitions for factory use. The normal system image on one partition, but without dex preopt. And a system_other image that just contains the odex files. The dex files will not be stripped out of the system image, in case the second system partition is wiped. Setting BOARD_USES_SYSTEM_OTHER_ODEX := true in the BoardConfig.mk enables this behavior. One can control which directories are placed in system_other by the SYSTEM_OTHER_ODEX_FILTER configuration variable. Currently we default to only copying only app and priv-app odexs. Bug: 29278988 Change-Id: I7f4e87da919e7dc6a89fd8c668193cd4e98631bc
2016-06-17 05:47:10 +08:00
Don't preopt system server apps in system_other. bug:36532541 bug:33799337 Test: m -j32 && find out/target -name \*.odex (cherry picked from commit a2c6c0b11e49d94afbde3ab34c1521ad91befb8a) Change-Id: Ic4396bb6c543af1c05f56030495caafb245ea304
2017-03-24 22:45:59 +08:00
# Method returning whether the install path $(1) should be for system_other.
Build: Change SANITIZE_LITE install settings Under SANITIZE_LITE, the default app_process is not instrumented. Embedding sanitized libraries into APKs will lead to crashing apps. So move second-stage APKs to /data/asan. The tradeoff is that for now we won't run these sanitized binaries. Adding support for that is future work. Also do not do a rebuild of the boot image. This would invalidate the first-stage results. Note that this is technically dangerous, as stack overflow guard sizes will not be adapted for ASAN runs. However, this is a general incompatibility. Also do not rebuild system_other. Apps are not rebuilt, so it will create an empty image. (cherry picked from commit 481660ef3419ba84e798a2659a747bf3f3e90945) Bug: 36458146 Test: m && m SANITIZE_TARGET=address SANITIZE_LITE=true Merged-In: I3898bc53cad264529f126e6bf0af9c6ca1736877 Change-Id: I3898bc53cad264529f126e6bf0af9c6ca1736877
2017-06-17 01:24:54 +08:00
# Under SANITIZE_LITE, we do not want system_other. Just put things under /data/asan.
ifeq ($(SANITIZE_LITE),true)
install-on-system-other =
else
Add a new PRODUCT variable for forcing 'speed' preopt. bug: 35872915 Test: build Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-12 22:19:16 +08:00
install-on-system-other = $(filter-out $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1)))))
Build: Change SANITIZE_LITE install settings Under SANITIZE_LITE, the default app_process is not instrumented. Embedding sanitized libraries into APKs will lead to crashing apps. So move second-stage APKs to /data/asan. The tradeoff is that for now we won't run these sanitized binaries. Adding support for that is future work. Also do not do a rebuild of the boot image. This would invalidate the first-stage results. Note that this is technically dangerous, as stack overflow guard sizes will not be adapted for ASAN runs. However, this is a general incompatibility. Also do not rebuild system_other. Apps are not rebuilt, so it will create an empty image. (cherry picked from commit 481660ef3419ba84e798a2659a747bf3f3e90945) Bug: 36458146 Test: m && m SANITIZE_TARGET=address SANITIZE_LITE=true Merged-In: I3898bc53cad264529f126e6bf0af9c6ca1736877 Change-Id: I3898bc53cad264529f126e6bf0af9c6ca1736877
2017-06-17 01:24:54 +08:00
endif
Don't preopt system server apps in system_other. bug:36532541 bug:33799337 Test: m -j32 && find out/target -name \*.odex (cherry picked from commit a2c6c0b11e49d94afbde3ab34c1521ad91befb8a) Change-Id: Ic4396bb6c543af1c05f56030495caafb245ea304
2017-03-24 22:45:59 +08:00
Add DEXPREOPT support for ART Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-11-15 15:44:56 +08:00
include $(BUILD_SYSTEM)/dex_preopt_libart.mk
Integrate dexpreopt into the build system. Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-18 07:36:06 +08:00
Create dist for boot and system jars We need the jars on boot and system server classpath in order to symbolize profile information. Having the jars packed in a dist zip will help a lot with the tools. Test: m Bug: 73313191 Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 02:33:27 +08:00
boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip
Fix boot_profile_jars.zip Some of the inputs to boot_profile_jars.zip have moved outside of $(PRODUCT_OUT), update the -C argument to soong_zip to point to the right directory. Also make the rule to build the zip always present, and only gate the dist command behind PRODUCT_DIST_BOOT_AND_SYSTEM_JARS. Test: m out/target/product/blueline/boot_profile_jars.zip Change-Id: Iaa72be955edda445f3eab041a63f79c9055d6b33
2019-02-21 04:39:57 +08:00
bootclasspath_jars := $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)
system_server_jars := $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar)
Create dist for boot and system jars We need the jars on boot and system server classpath in order to symbolize profile information. Having the jars packed in a dist zip will help a lot with the tools. Test: m Bug: 73313191 Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 02:33:27 +08:00
Fix boot_profile_jars.zip Some of the inputs to boot_profile_jars.zip have moved outside of $(PRODUCT_OUT), update the -C argument to soong_zip to point to the right directory. Also make the rule to build the zip always present, and only gate the dist command behind PRODUCT_DIST_BOOT_AND_SYSTEM_JARS. Test: m out/target/product/blueline/boot_profile_jars.zip Change-Id: Iaa72be955edda445f3eab041a63f79c9055d6b33
2019-02-21 04:39:57 +08:00
$(boot_profile_jars_zip): PRIVATE_BOOTCLASSPATH_JARS := $(bootclasspath_jars)
$(boot_profile_jars_zip): PRIVATE_SYSTEM_SERVER_JARS := $(system_server_jars)
$(boot_profile_jars_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP)
@echo "Create boot profiles package: $@"
Create dist for boot and system jars We need the jars on boot and system server classpath in order to symbolize profile information. Having the jars packed in a dist zip will help a lot with the tools. Test: m Bug: 73313191 Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 02:33:27 +08:00
rm -f $@
Fix boot_profile_jars.zip Some of the inputs to boot_profile_jars.zip have moved outside of $(PRODUCT_OUT), update the -C argument to soong_zip to point to the right directory. Also make the rule to build the zip always present, and only gate the dist command behind PRODUCT_DIST_BOOT_AND_SYSTEM_JARS. Test: m out/target/product/blueline/boot_profile_jars.zip Change-Id: Iaa72be955edda445f3eab041a63f79c9055d6b33
2019-02-21 04:39:57 +08:00
$(SOONG_ZIP) -o $@ \
-C $(dir $(firstword $(PRIVATE_BOOTCLASSPATH_JARS)))/.. $(addprefix -f ,$(PRIVATE_BOOTCLASSPATH_JARS)) \
-C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_SYSTEM_SERVER_JARS))
Create dist for boot and system jars We need the jars on boot and system server classpath in order to symbolize profile information. Having the jars packed in a dist zip will help a lot with the tools. Test: m Bug: 73313191 Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 02:33:27 +08:00
Fix boot_profile_jars.zip Some of the inputs to boot_profile_jars.zip have moved outside of $(PRODUCT_OUT), update the -C argument to soong_zip to point to the right directory. Also make the rule to build the zip always present, and only gate the dist command behind PRODUCT_DIST_BOOT_AND_SYSTEM_JARS. Test: m out/target/product/blueline/boot_profile_jars.zip Change-Id: Iaa72be955edda445f3eab041a63f79c9055d6b33
2019-02-21 04:39:57 +08:00
ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)
Create dist for boot and system jars We need the jars on boot and system server classpath in order to symbolize profile information. Having the jars packed in a dist zip will help a lot with the tools. Test: m Bug: 73313191 Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 02:33:27 +08:00
$(call dist-for-goals, droidcore, $(boot_profile_jars_zip))
endif