From 229d0534dc04a396dc8279b30cd4a0e1abca1042 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 5 May 2017 14:59:06 -0700 Subject: [PATCH 1/7] Use speed-profile instead of quicken for the profile case Reduces calculator launch from 354 -> 325 with a profile. (cherry picked from commit c5536ffbd3fbbd44a167c0841a12d11ef6976946) Bug: 38032017 Test: mm Merged-In: I795a2d3f4db5546be4d77c3716e69d20d8f23549 Change-Id: I795a2d3f4db5546be4d77c3716e69d20d8f23549 --- core/dex_preopt_odex_install.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index b9c0fc60b..602ad008a 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -159,7 +159,12 @@ ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_DEXPREOPT_SPEED_APPS) $ else # If no compiler filter is specified, default to 'quicken' to save on storage. ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS))) - LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken + 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 + LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken + endif endif endif From fcc8d8b26d9ea3a94796aa181d4d4919de259123 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 5 May 2017 17:22:37 -0700 Subject: [PATCH 2/7] Default profile usage based on the existence of the profile Currently this only checks vendor/google_data/art_profile, but the plan is to use a per product directory in the near future. (cherry picked from commit 6324c2d29133ccaf8230f663251e1f3305a1d66d) Bug: 38032017 Test: make and make sure the profile was used (calculator). Merged-In: I8de6484dbcac5fc040ad70f97e97d193b317af8c Change-Id: I8de6484dbcac5fc040ad70f97e97d193b317af8c --- core/dex_preopt_odex_install.mk | 26 +++++++++++++++++++------- core/product.mk | 1 + core/product_config.mk | 3 +++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 602ad008a..7340ddc44 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -59,6 +59,25 @@ built_installed_vdex := built_installed_art := ifdef LOCAL_DEX_PREOPT + +ifeq (false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)) +LOCAL_DEX_PREOPT_GENERATE_PROFILE := false +endif + +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 + 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). @@ -113,13 +132,6 @@ installed_vdex := $(strip $(installed_vdex)) installed_art := $(strip $(installed_art)) ifdef built_odex - -ifndef LOCAL_DEX_PREOPT_GENERATE_PROFILE -ifeq (true,$(WITH_DEX_PREOPT_GENERATE_PROFILE)) - LOCAL_DEX_PREOPT_GENERATE_PROFILE := true -endif -endif - 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)) diff --git a/core/product.mk b/core/product.mk index c5ddf817a..070986b06 100644 --- a/core/product.mk +++ b/core/product.mk @@ -123,6 +123,7 @@ _product_var_list := \ PRODUCT_DEX_PREOPT_MODULE_CONFIGS \ PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \ PRODUCT_DEX_PREOPT_BOOT_FLAGS \ + PRODUCT_DEX_PREOPT_PROFILE_DIR \ PRODUCT_SANITIZER_MODULE_CONFIGS \ PRODUCT_SYSTEM_BASE_FS_PATH \ PRODUCT_VENDOR_BASE_FS_PATH \ diff --git a/core/product_config.mk b/core/product_config.mk index 36f473ff0..ed8b9a72b 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -380,6 +380,9 @@ PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)) PRODUCT_DEX_PREOPT_BOOT_FLAGS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_BOOT_FLAGS)) +PRODUCT_DEX_PREOPT_PROFILE_DIR := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_PROFILE_DIR)) + # Resolve and setup per-module dex-preopt configs. PRODUCT_DEX_PREOPT_MODULE_CONFIGS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_MODULE_CONFIGS)) From 98f44b7f20c2d045fa7356c2788482a30ed454d2 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 9 May 2017 19:17:33 -0700 Subject: [PATCH 3/7] Install preopted profiles on device They are stored in /system/etc/profiles/, these will be copied to the over the data profiles during fist boot. This means is required to avoid missing JIT samples for the preopt compiled methods. (cherry picked from commit 44c9c076d36c2f6f3a4cde4a34b5c90678a494e6) Bug: 38032017 Test: make and flash Test: adb shell ls -l /system/etc/profiles/ Merged-In: Ia4573464ac39c4720e0d9e8a29b8ea4213bd9d78 Change-Id: Ia4573464ac39c4720e0d9e8a29b8ea4213bd9d78 --- core/dex_preopt_odex_install.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 7340ddc44..2b401f00b 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -64,6 +64,11 @@ 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. @@ -77,6 +82,7 @@ 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 @@ -153,7 +159,12 @@ $(my_built_profile): --apk=$(PRIVATE_BUILT_MODULE) \ --dex-location=$(PRIVATE_DEX_LOCATION) \ --reference-profile-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 @@ -189,9 +200,11 @@ endif 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) @@ -207,6 +220,6 @@ DEXPREOPT.MODULES.$(LOCAL_MODULE_CLASS) := $(sort \ # Make sure to install the .odex and .vdex when you run "make " -$(my_all_targets): $(installed_odex) $(installed_vdex) $(installed_art) +$(my_all_targets): $(installed_odex) $(installed_vdex) $(installed_art) $(my_installed_profile) endif # LOCAL_DEX_PREOPT From abcf66b5385063aba865f638f6d7afef717ec20c Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 16 Jun 2017 11:17:53 -0700 Subject: [PATCH 4/7] Allow custom compiler filters for system server jars Passing down a compiler filter in LOCAL_DEX_PREOPT_FLAGS or PRODUCT_DEX_PREOPT_DEFAULT_FLAGS will no longer always get overridden to speed. (cherry picked from commit b8d3cc02cdbb2708deb699ec00b6d1e3fd291196) Bug: 62356545 Test: make and flash Merged-In: I8b777c8881cba6b11cda56d27f0a714c92d70d94 Change-Id: I8b777c8881cba6b11cda56d27f0a714c92d70d94 --- core/dex_preopt_odex_install.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 2b401f00b..9c543dde1 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -175,17 +175,17 @@ LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS) endif endif -ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE))) - # Jars of system server, apps loaded into system server, and apps the product wants to be - # compiled with the 'speed' compiler filter. - LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed -else - # If no compiler filter is specified, default to 'quicken' to save on storage. - ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS))) +ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS))) + ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE))) + # Jars of system server, 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 From 6228ec2d0768ffd25f7e60e70b82d8b5a067e9f9 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 23 Jun 2017 10:44:45 -0700 Subject: [PATCH 5/7] Add product system server compiler filter property The product only needs to specify PRODUCT_SYSTEM_SERVER_COMPILER_FILTER. This determines what compiler filter system server jars are compiled with. (cherry picked from commit 6a90210c62a76925827fd65f5e7e96318eb9ac5a) Test: update marlin device Test: make and look at services.odex Bug: 62356545 Merged-In: Id51726ae03576d7b4eb784b861158bb451c39deb Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb --- core/dex_preopt_odex_install.mk | 28 +++++++++++++++++++--------- core/main.mk | 5 +++++ core/product.mk | 1 + core/product_config.mk | 3 +++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 9c543dde1..76d56c05b 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -175,18 +175,28 @@ 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) $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE))) - # Jars of system server, 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 + 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 - 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 + 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 - # If no compiler filter is specified, default to 'quicken' to save on storage. - LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken + 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 diff --git a/core/main.mk b/core/main.mk index d14d64bae..3161cc7d7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -214,6 +214,11 @@ ifdef TARGET_2ND_ARCH endif endif +# Add the system server compiler filter if they are specified for the product. +ifneq (,$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)) +ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.systemservercompilerfilter=$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER) +endif + ## user/userdebug ## user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT)) diff --git a/core/product.mk b/core/product.mk index 070986b06..a3e8a8044 100644 --- a/core/product.mk +++ b/core/product.mk @@ -124,6 +124,7 @@ _product_var_list := \ PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \ PRODUCT_DEX_PREOPT_BOOT_FLAGS \ PRODUCT_DEX_PREOPT_PROFILE_DIR \ + PRODUCT_SYSTEM_SERVER_COMPILER_FILTER \ PRODUCT_SANITIZER_MODULE_CONFIGS \ PRODUCT_SYSTEM_BASE_FS_PATH \ PRODUCT_VENDOR_BASE_FS_PATH \ diff --git a/core/product_config.mk b/core/product_config.mk index ed8b9a72b..12709c2ee 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -383,6 +383,9 @@ PRODUCT_DEX_PREOPT_BOOT_FLAGS := \ PRODUCT_DEX_PREOPT_PROFILE_DIR := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_PROFILE_DIR)) +PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)) + # Resolve and setup per-module dex-preopt configs. PRODUCT_DEX_PREOPT_MODULE_CONFIGS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_MODULE_CONFIGS)) From f0db908ea755e564a090a6966883bba17b4f1004 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 23 Jun 2017 14:47:56 -0700 Subject: [PATCH 6/7] Add PRODUCT_SYSTEM_SERVER_DEBUG_INFO property Used for specifying if a product should get system server mini debug info. Defaults to true. Can be disabled by doing PRODUCT_SYSTEM_SERVER_DEBUG_INFO := false The property overrides WITH_DEXPREOPT_DEBUG_INFO, so if PRODUCT_SYSTEM_SERVER_DEBUG_INFO is true but WITH_DEXPREOPT_DEBUG_INFO is false, system server will have mini debug info. (cherry picked from commit 94f5f93236bf6743be674b34ae9cf04a4282bf5c) Bug: 62862291 Test: make Merged-In: I189cd144ce3ade5f02855db022874c8dd45cbdf3 Change-Id: I189cd144ce3ade5f02855db022874c8dd45cbdf3 --- core/dex_preopt_odex_install.mk | 15 +++++++++++++++ core/product.mk | 1 + core/product_config.mk | 2 ++ 3 files changed, 18 insertions(+) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 76d56c05b..136def470 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -201,6 +201,21 @@ ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS))) 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) diff --git a/core/product.mk b/core/product.mk index a3e8a8044..590148f0d 100644 --- a/core/product.mk +++ b/core/product.mk @@ -120,6 +120,7 @@ _product_var_list := \ PRODUCT_VERITY_SIGNING_KEY \ PRODUCT_SYSTEM_VERITY_PARTITION \ PRODUCT_VENDOR_VERITY_PARTITION \ + PRODUCT_SYSTEM_SERVER_DEBUG_INFO \ PRODUCT_DEX_PREOPT_MODULE_CONFIGS \ PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \ PRODUCT_DEX_PREOPT_BOOT_FLAGS \ diff --git a/core/product_config.mk b/core/product_config.mk index 12709c2ee..4c3824a69 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -385,6 +385,8 @@ PRODUCT_DEX_PREOPT_PROFILE_DIR := \ PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)) +PRODUCT_SYSTEM_SERVER_DEBUG_INFO := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_DEBUG_INFO)) # Resolve and setup per-module dex-preopt configs. PRODUCT_DEX_PREOPT_MODULE_CONFIGS := \ From a61acf62c95adba6b6aeea6fdb4d24fe8ba5fb1a Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 28 Jun 2017 18:23:37 -0700 Subject: [PATCH 7/7] Add support for using profiles for boot images Added two product flags: PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION If PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE is enabled (default false), a art profile is used to create the preopted boot image. This profile is also passed to the runtime in AndroidRuntime.cpp. The profile is created from the PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION variable that defaults to "frameworks/base/boot-image-profile.txt". (cherry picked from commit 77226f63339895b886643b687bcb5b62b9be6f58) Bug: 37966211 Test: make and flash Merged-In: Ic89cc4c0c4d39aa9726843f5d9c2fb1dedeb7885 Change-Id: Ic89cc4c0c4d39aa9726843f5d9c2fb1dedeb7885 --- core/dex_preopt_libart.mk | 36 ++++++++++++++++++++++++++++++++++ core/dex_preopt_libart_boot.mk | 17 ++++++++++++---- core/product.mk | 2 ++ core/product_config.mk | 6 ++++++ 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 9db5dbfb4..47fdba610 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -88,6 +88,42 @@ LIBART_TARGET_BOOT_DEX_FILES := $(foreach jar,$(LIBART_TARGET_BOOT_JARS),$(call LIBART_TARGET_BOOT_ART_EXTRA_FILES := $(foreach jar,$(wordlist 2,999,$(LIBART_TARGET_BOOT_JARS)),boot-$(jar).art boot-$(jar).oat boot-$(jar).vdex) LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat boot.vdex +# If we use a boot image profile. +my_use_profile_for_boot_image := $(PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE) +ifeq (,$(my_use_profile_for_boot_image)) +# If not set, use the default. +my_use_profile_for_boot_image := false +endif + +ifeq (true,$(my_use_profile_for_boot_image)) + +# Location of text based profile for the boot image. +my_boot_image_profile_location := $(PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION) +ifeq (,$(my_boot_image_profile_location)) +# If not set, use the default. +my_boot_image_profile_location := frameworks/base/boot-image-profile.txt +endif + +# Code to create the boot image profile, not in dex_preopt_libart_boot.mk since the profile is the same for all archs. +my_out_boot_image_profile_location := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.prof +$(my_out_boot_image_profile_location): PRIVATE_PROFILE_INPUT_LOCATION := $(my_boot_image_profile_location) +$(my_out_boot_image_profile_location): $(PROFMAN) $(LIBART_TARGET_BOOT_DEX_FILES) $(my_boot_image_profile_location) + @echo "target profman: $@" + @mkdir -p $(dir $@) + ANDROID_LOG_TAGS="*:e" $(PROFMAN) \ + --create-profile-from=$(PRIVATE_PROFILE_INPUT_LOCATION) \ + $(addprefix --apk=,$(LIBART_TARGET_BOOT_DEX_FILES)) \ + $(addprefix --dex-location=,$(LIBART_TARGET_BOOT_DEX_LOCATIONS)) \ + --reference-profile-file=$@ + +# We want to install the profile even if we are not using preopt since it is required to generate +# the image on the device. +my_installed_profile := $(TARGET_OUT)/etc/boot-image.prof +$(eval $(call copy-one-file,$(my_out_boot_image_profile_location),$(my_installed_profile))) +ALL_DEFAULT_INSTALLED_MODULES += $(my_installed_profile) + +endif + my_2nd_arch_prefix := include $(BUILD_SYSTEM)/dex_preopt_libart_boot.mk diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index 860a66adb..6e49f64ac 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -50,18 +50,27 @@ $($(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES) : $($(my_2n @mkdir -p $(dir $@) $(hide) $(ACP) -fp $(dir $<)$(notdir $@) $@ +ifeq (,$(my_out_boot_image_profile_location)) +my_boot_image_flags := $(COMPILED_CLASSES_FLAGS) +my_boot_image_flags += --image-classes=$(PRELOADED_CLASSES) +else +my_boot_image_flags := --compiler-filter=speed-profile +my_boot_image_flags += --profile-file=$(my_out_boot_image_profile_location) +endif + +$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_BOOT_IMAGE_FLAGS := $(my_boot_image_flags) $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix) # Use dex2oat debug version for better error reporting -$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(COMPILED_CLASSES) $(DEX2OAT_DEPENDENCY) +$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(COMPILED_CLASSES) $(DEX2OAT_DEPENDENCY) $(my_out_profile_location) @echo "target dex2oat: $@" @mkdir -p $(dir $@) @mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED)) @rm -f $(dir $@)/*.art $(dir $@)/*.oat @rm -f $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED))/*.art @rm -f $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED))/*.oat - $(hide) ANDROID_LOG_TAGS="*:e" $(DEX2OAT) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) \ + $(DEX2OAT) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) \ --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \ - --image-classes=$(PRELOADED_CLASSES) \ + $(PRIVATE_BOOT_IMAGE_FLAGS) \ $(addprefix --dex-file=,$(LIBART_TARGET_BOOT_DEX_FILES)) \ $(addprefix --dex-location=,$(LIBART_TARGET_BOOT_DEX_LOCATIONS)) \ --oat-symbols=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED) \ @@ -75,4 +84,4 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE --runtime-arg -Xnorelocate --compile-pic \ --no-generate-debug-info --generate-build-id \ --multi-image --no-inline-from=core-oj.jar \ - $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(COMPILED_CLASSES_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS) + $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS) diff --git a/core/product.mk b/core/product.mk index 590148f0d..6722526c8 100644 --- a/core/product.mk +++ b/core/product.mk @@ -125,6 +125,8 @@ _product_var_list := \ PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \ PRODUCT_DEX_PREOPT_BOOT_FLAGS \ PRODUCT_DEX_PREOPT_PROFILE_DIR \ + PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \ + PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE \ PRODUCT_SYSTEM_SERVER_COMPILER_FILTER \ PRODUCT_SANITIZER_MODULE_CONFIGS \ PRODUCT_SYSTEM_BASE_FS_PATH \ diff --git a/core/product_config.mk b/core/product_config.mk index 4c3824a69..6812b05d4 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -383,6 +383,12 @@ PRODUCT_DEX_PREOPT_BOOT_FLAGS := \ PRODUCT_DEX_PREOPT_PROFILE_DIR := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_PROFILE_DIR)) +# Boot image options. +PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE)) +PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION)) + PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)) PRODUCT_SYSTEM_SERVER_DEBUG_INFO := \