bbcdc07d12
We were previously using LOCAL_BUILT_MODULE, which wouldn't work in the case that "nostripping" wasn't specified (i.e when we stripped). The issue is that the built module has its classes.dex entry stripped, which means that profman can't do anything meaningful with it. In this change, we use the right set of files for JAVA_LIBRARIES as well as prebuilt PACKAGES. Fixing apps built from source is a larger task and has been left for a future change. Depending on ART changes, we might need to disable stripping for all apps and/or align userdebug and user builds with each other. This will be tackled separately. Test: make Bug: 64896089 Change-Id: I4fd256d187b66763f354cc6001953469c2cd8fbb
255 lines
9.9 KiB
Makefile
255 lines
9.9 KiB
Makefile
# dexpreopt_odex_install.mk is used to define odex creation rules for JARs and APKs
|
|
# This file depends on variables set in base_rules.mk
|
|
# Output variables: LOCAL_DEX_PREOPT, built_odex, dexpreopt_boot_jar_module
|
|
|
|
# Setting LOCAL_DEX_PREOPT based on WITH_DEXPREOPT, LOCAL_DEX_PREOPT, etc
|
|
LOCAL_DEX_PREOPT := $(strip $(LOCAL_DEX_PREOPT))
|
|
ifneq (true,$(WITH_DEXPREOPT))
|
|
LOCAL_DEX_PREOPT :=
|
|
else # WITH_DEXPREOPT=true
|
|
ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty
|
|
ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined
|
|
ifneq ($(filter $(TARGET_OUT)/%,$(my_module_path)),) # Installed to system.img.
|
|
ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty
|
|
# If we have product-specific config for this module?
|
|
ifeq (disable,$(DEXPREOPT.$(TARGET_PRODUCT).$(LOCAL_MODULE).CONFIG))
|
|
LOCAL_DEX_PREOPT := false
|
|
else
|
|
LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)
|
|
endif
|
|
else # LOCAL_APK_LIBRARIES not empty
|
|
LOCAL_DEX_PREOPT := nostripping
|
|
endif # LOCAL_APK_LIBRARIES not empty
|
|
endif # Installed to system.img.
|
|
endif # LOCAL_DEX_PREOPT undefined
|
|
endif # TARGET_BUILD_APPS empty
|
|
endif # WITH_DEXPREOPT=true
|
|
ifeq (false,$(LOCAL_DEX_PREOPT))
|
|
LOCAL_DEX_PREOPT :=
|
|
endif
|
|
ifdef LOCAL_UNINSTALLABLE_MODULE
|
|
LOCAL_DEX_PREOPT :=
|
|
endif
|
|
ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code
|
|
LOCAL_DEX_PREOPT :=
|
|
endif
|
|
# if WITH_DEXPREOPT_BOOT_IMG_ONLY=true and module is not in boot class path skip
|
|
ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_ONLY))
|
|
ifeq ($(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)
|
|
LOCAL_DEX_PREOPT :=
|
|
endif
|
|
endif
|
|
# if installing into system, and odex are being installed into system_other, don't strip
|
|
ifeq ($(BOARD_USES_SYSTEM_OTHER_ODEX),true)
|
|
ifeq ($(LOCAL_DEX_PREOPT),true)
|
|
ifneq ($(call install-on-system-other, $(my_module_path)),)
|
|
LOCAL_DEX_PREOPT := nostripping
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
built_odex :=
|
|
built_vdex :=
|
|
built_art :=
|
|
installed_odex :=
|
|
installed_vdex :=
|
|
installed_art :=
|
|
built_installed_odex :=
|
|
built_installed_vdex :=
|
|
built_installed_art :=
|
|
|
|
ifdef LOCAL_DEX_PREOPT
|
|
|
|
ifeq (false,$(WITH_DEX_PREOPT_GENERATE_PROFILE))
|
|
LOCAL_DEX_PREOPT_GENERATE_PROFILE := false
|
|
endif
|
|
|
|
ifdef LOCAL_VENDOR_MODULE
|
|
ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))
|
|
$(error profiles are not supported for vendor modules)
|
|
endif
|
|
else
|
|
ifndef LOCAL_DEX_PREOPT_GENERATE_PROFILE
|
|
# If LOCAL_DEX_PREOPT_GENERATE_PROFILE is not defined, default it based on the existence of the
|
|
# profile class listing. TODO: Use product specific directory here.
|
|
my_classes_directory := $(PRODUCT_DEX_PREOPT_PROFILE_DIR)
|
|
LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := $(my_classes_directory)/$(LOCAL_MODULE).prof.txt
|
|
ifneq (,$(wildcard $(LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)))
|
|
# Profile listing exists, use it to generate the profile.
|
|
ifeq ($(LOCAL_DEX_PREOPT_APP_IMAGE),)
|
|
LOCAL_DEX_PREOPT_APP_IMAGE := true
|
|
endif
|
|
LOCAL_DEX_PREOPT_GENERATE_PROFILE := true
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
dexpreopt_boot_jar_module := $(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE))
|
|
ifdef dexpreopt_boot_jar_module
|
|
# For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).
|
|
# We use this installed_odex trick to get boot.art installed.
|
|
installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
|
|
# Append the odex for the 2nd arch if we have one.
|
|
installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
|
|
else # boot jar
|
|
ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)
|
|
# For a Java library, by default we build odex for both 1st arch and 2nd arch.
|
|
# But it can be overridden with "LOCAL_MULTILIB := first".
|
|
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
|
|
# For system server jars, we build for only "first".
|
|
my_module_multilib := first
|
|
else
|
|
my_module_multilib := $(LOCAL_MULTILIB)
|
|
endif
|
|
# #################################################
|
|
# Odex for the 1st arch
|
|
my_2nd_arch_prefix :=
|
|
include $(BUILD_SYSTEM)/setup_one_odex.mk
|
|
# #################################################
|
|
# Odex for the 2nd arch
|
|
ifdef TARGET_2ND_ARCH
|
|
ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)
|
|
ifneq (first,$(my_module_multilib))
|
|
my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
|
|
include $(BUILD_SYSTEM)/setup_one_odex.mk
|
|
endif # my_module_multilib is not first.
|
|
endif # TARGET_TRANSLATE_2ND_ARCH not true
|
|
endif # TARGET_2ND_ARCH
|
|
# #################################################
|
|
else # must be APPS
|
|
# The preferred arch
|
|
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
|
|
include $(BUILD_SYSTEM)/setup_one_odex.mk
|
|
ifdef TARGET_2ND_ARCH
|
|
ifeq ($(LOCAL_MULTILIB),both)
|
|
# The non-preferred arch
|
|
my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX))
|
|
include $(BUILD_SYSTEM)/setup_one_odex.mk
|
|
endif # LOCAL_MULTILIB is both
|
|
endif # TARGET_2ND_ARCH
|
|
endif # LOCAL_MODULE_CLASS
|
|
endif # boot jar
|
|
|
|
built_odex := $(strip $(built_odex))
|
|
built_vdex := $(strip $(built_vdex))
|
|
built_art := $(strip $(built_art))
|
|
installed_odex := $(strip $(installed_odex))
|
|
installed_vdex := $(strip $(installed_vdex))
|
|
installed_art := $(strip $(installed_art))
|
|
|
|
ifdef built_odex
|
|
ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))
|
|
ifndef LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING
|
|
$(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING))
|
|
endif
|
|
ifeq (,$(dex_preopt_profile_src_file))
|
|
$(call pretty-error, Internal error: dex_preopt_profile_src_file must be set)
|
|
endif
|
|
my_built_profile := $(dir $(LOCAL_BUILT_MODULE))/profile.prof
|
|
my_dex_location := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE))
|
|
$(built_odex): $(my_built_profile)
|
|
$(built_odex): PRIVATE_PROFILE_PREOPT_FLAGS := --profile-file=$(my_built_profile)
|
|
$(my_built_profile): PRIVATE_BUILT_MODULE := $(dex_preopt_profile_src_file)
|
|
$(my_built_profile): PRIVATE_DEX_LOCATION := $(my_dex_location)
|
|
$(my_built_profile): PRIVATE_SOURCE_CLASSES := $(LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)
|
|
$(my_built_profile): $(LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)
|
|
$(my_built_profile): $(PROFMAN)
|
|
$(my_built_profile): $(dex_preopt_profile_src_file)
|
|
$(my_built_profile):
|
|
$(hide) mkdir -p $(dir $@)
|
|
ANDROID_LOG_TAGS="*:e" $(PROFMAN) \
|
|
--create-profile-from=$(PRIVATE_SOURCE_CLASSES) \
|
|
--apk=$(PRIVATE_BUILT_MODULE) \
|
|
--dex-location=$(PRIVATE_DEX_LOCATION) \
|
|
--reference-profile-file=$@
|
|
dex_preopt_profile_src_file:=
|
|
my_installed_profile := $(LOCAL_INSTALLED_MODULE).prof
|
|
$(eval $(call copy-one-file,$(my_built_profile),$(my_installed_profile)))
|
|
build_installed_profile:=$(my_built_profile):$(my_installed_profile)
|
|
else
|
|
build_installed_profile:=
|
|
my_installed_profile :=
|
|
$(built_odex): PRIVATE_PROFILE_PREOPT_FLAGS :=
|
|
endif
|
|
|
|
ifndef LOCAL_DEX_PREOPT_FLAGS
|
|
LOCAL_DEX_PREOPT_FLAGS := $(DEXPREOPT.$(TARGET_PRODUCT).$(LOCAL_MODULE).CONFIG)
|
|
ifndef LOCAL_DEX_PREOPT_FLAGS
|
|
LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)
|
|
endif
|
|
endif
|
|
|
|
my_system_server_compiler_filter := $(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)
|
|
ifeq (,$(my_system_server_compiler_filter))
|
|
my_system_server_compiler_filter := speed
|
|
endif
|
|
|
|
ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS)))
|
|
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
|
|
# Jars of system server, use the product option if it is set, speed otherwise.
|
|
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=$(my_system_server_compiler_filter)
|
|
else
|
|
ifneq (,$(filter $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))
|
|
# Apps loaded into system server, and apps the product default to being compiled with the
|
|
# 'speed' compiler filter.
|
|
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed
|
|
else
|
|
ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))
|
|
# For non system server jars, use speed-profile when we have a profile.
|
|
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed-profile
|
|
else
|
|
# If no compiler filter is specified, default to 'quicken' to save on storage.
|
|
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
# PRODUCT_SYSTEM_SERVER_DEBUG_INFO overrides WITH_DEXPREOPT_DEBUG_INFO.
|
|
my_system_server_debug_info := $(PRODUCT_SYSTEM_SERVER_DEBUG_INFO)
|
|
ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
|
# Only enable for non-eng builds.
|
|
ifeq (,$(my_system_server_debug_info))
|
|
my_system_server_debug_info := true
|
|
endif
|
|
endif
|
|
|
|
ifeq (true, $(my_system_server_debug_info))
|
|
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
|
|
LOCAL_DEX_PREOPT_FLAGS += --generate-mini-debug-info
|
|
endif
|
|
endif
|
|
|
|
$(built_odex): PRIVATE_DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)
|
|
$(built_vdex): $(built_odex)
|
|
$(built_art): $(built_odex)
|
|
endif
|
|
|
|
# Add the installed_odex to the list of installed files for this module.
|
|
ALL_MODULES.$(my_register_name).INSTALLED += $(installed_odex)
|
|
ALL_MODULES.$(my_register_name).INSTALLED += $(installed_vdex)
|
|
ALL_MODULES.$(my_register_name).INSTALLED += $(installed_art)
|
|
ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed_profile)
|
|
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(built_installed_odex)
|
|
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(built_installed_vdex)
|
|
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(built_installed_art)
|
|
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(build_installed_profile)
|
|
|
|
# Record dex-preopt config.
|
|
DEXPREOPT.$(LOCAL_MODULE).DEX_PREOPT := $(LOCAL_DEX_PREOPT)
|
|
DEXPREOPT.$(LOCAL_MODULE).MULTILIB := $(LOCAL_MULTILIB)
|
|
DEXPREOPT.$(LOCAL_MODULE).DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)
|
|
DEXPREOPT.$(LOCAL_MODULE).PRIVILEGED_MODULE := $(LOCAL_PRIVILEGED_MODULE)
|
|
DEXPREOPT.$(LOCAL_MODULE).VENDOR_MODULE := $(LOCAL_VENDOR_MODULE)
|
|
DEXPREOPT.$(LOCAL_MODULE).TARGET_ARCH := $(LOCAL_MODULE_TARGET_ARCH)
|
|
DEXPREOPT.$(LOCAL_MODULE).INSTALLED := $(installed_odex)
|
|
DEXPREOPT.$(LOCAL_MODULE).INSTALLED_STRIPPED := $(LOCAL_INSTALLED_MODULE)
|
|
DEXPREOPT.MODULES.$(LOCAL_MODULE_CLASS) := $(sort \
|
|
$(DEXPREOPT.MODULES.$(LOCAL_MODULE_CLASS)) $(LOCAL_MODULE))
|
|
|
|
|
|
# Make sure to install the .odex and .vdex when you run "make <module_name>"
|
|
$(my_all_targets): $(installed_odex) $(installed_vdex) $(installed_art) $(my_installed_profile)
|
|
|
|
endif # LOCAL_DEX_PREOPT
|