6db5b0ea9a
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
103 lines
4.4 KiB
Makefile
103 lines
4.4 KiB
Makefile
####################################
|
|
# dexpreopt support - typically used on user builds to run dexopt (for Dalvik) or dex2oat (for ART) ahead of time
|
|
#
|
|
####################################
|
|
|
|
include $(BUILD_SYSTEM)/dex_preopt_config.mk
|
|
|
|
# Method returning whether the install path $(1) should be for system_other.
|
|
# Under SANITIZE_LITE, we do not want system_other. Just put things under /data/asan.
|
|
ifeq ($(SANITIZE_LITE),true)
|
|
install-on-system-other =
|
|
else
|
|
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)))))
|
|
endif
|
|
|
|
# Special rules for building stripped boot jars that override java_library.mk rules
|
|
|
|
# $(1): boot jar module name
|
|
define _dexpreopt-boot-jar-remove-classes.dex
|
|
_dbj_jar_no_dex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1)_nodex.jar
|
|
_dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar
|
|
|
|
$(call dexpreopt-copy-jar,$$(_dbj_src_jar),$$(_dbj_jar_no_dex),$(filter-out nostripping,$(DEX_PREOPT_DEFAULT)))
|
|
|
|
_dbj_jar_no_dex :=
|
|
_dbj_src_jar :=
|
|
endef
|
|
|
|
$(foreach b,$(DEXPREOPT_BOOT_JARS_MODULES),$(eval $(call _dexpreopt-boot-jar-remove-classes.dex,$(b))))
|
|
|
|
include $(BUILD_SYSTEM)/dex_preopt_libart.mk
|
|
|
|
# === hiddenapi rules ===
|
|
|
|
hiddenapi_stubs_jar = $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar
|
|
|
|
# Public API stubs
|
|
HIDDENAPI_STUBS := \
|
|
$(call hiddenapi_stubs_jar,android_stubs_current) \
|
|
$(call hiddenapi_stubs_jar,android.test.base.stubs)
|
|
|
|
# System API stubs
|
|
HIDDENAPI_STUBS_SYSTEM := \
|
|
$(call hiddenapi_stubs_jar,android_system_stubs_current)
|
|
|
|
# Test API stubs
|
|
HIDDENAPI_STUBS_TEST := \
|
|
$(call hiddenapi_stubs_jar,android_test_stubs_current)
|
|
|
|
# Allow products to define their own stubs for custom product jars that apps can use.
|
|
ifdef PRODUCT_HIDDENAPI_STUBS
|
|
HIDDENAPI_STUBS += $(foreach stub,$(PRODUCT_HIDDENAPI_STUBS), $(call hiddenapi_stubs_jar,$(stub)))
|
|
endif
|
|
|
|
ifdef PRODUCT_HIDDENAPI_STUBS_SYSTEM
|
|
HIDDENAPI_STUBS_SYSTEM += $(foreach stub,$(PRODUCT_HIDDENAPI_STUBS_SYSTEM), $(call hiddenapi_stubs_jar,$(stub)))
|
|
endif
|
|
|
|
ifdef PRODUCT_HIDDENAPI_STUBS_TEST
|
|
HIDDENAPI_STUBS_TEST += $(foreach stub,$(PRODUCT_HIDDENAPI_STUBS_TEST), $(call hiddenapi_stubs_jar,$(stub)))
|
|
endif
|
|
|
|
# Singleton rule which applies $(HIDDENAPI) on all boot class path dex files.
|
|
# Inputs are filled with `hiddenapi-copy-dex-files` rules.
|
|
.KATI_RESTAT: \
|
|
$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \
|
|
$(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST)
|
|
$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): PRIVATE_HIDDENAPI_STUBS := $(HIDDENAPI_STUBS)
|
|
$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): PRIVATE_HIDDENAPI_STUBS_SYSTEM := $(HIDDENAPI_STUBS_SYSTEM)
|
|
$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): PRIVATE_HIDDENAPI_STUBS_TEST := $(HIDDENAPI_STUBS_TEST)
|
|
$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): \
|
|
.KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST)
|
|
$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(HIDDENAPI) $(HIDDENAPI_STUBS) \
|
|
$(HIDDENAPI_STUBS_SYSTEM) $(HIDDENAPI_STUBS_TEST)
|
|
for INPUT_DEX in $(PRIVATE_DEX_INPUTS); do \
|
|
find `dirname $${INPUT_DEX}` -maxdepth 1 -name "classes*.dex"; \
|
|
done | sort | sed 's/^/--boot-dex=/' | xargs $(HIDDENAPI) list \
|
|
--stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS)) \
|
|
--stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_SYSTEM)) \
|
|
--stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_TEST)) \
|
|
--out-public=$(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST).tmp \
|
|
--out-private=$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST).tmp
|
|
$(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST))
|
|
$(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST))
|
|
|
|
|
|
|
|
ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)
|
|
boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip
|
|
all_boot_jars := \
|
|
$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),$(PRODUCT_OUT)/system/framework/$(m).jar) \
|
|
$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar)
|
|
|
|
$(boot_profile_jars_zip): PRIVATE_JARS := $(all_boot_jars)
|
|
$(boot_profile_jars_zip): $(all_boot_jars) $(SOONG_ZIP)
|
|
echo "Create boot profiles package: $@"
|
|
rm -f $@
|
|
$(SOONG_ZIP) -o $@ -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_JARS))
|
|
|
|
droidcore: $(boot_profile_jars_zip)
|
|
|
|
$(call dist-for-goals, droidcore, $(boot_profile_jars_zip))
|
|
endif
|