From ce94494b9307644da35ad6e7416ddd91d9e56def Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 28 Aug 2017 18:42:02 -0700 Subject: [PATCH 1/2] Enable profile based boot image by default Use profile based boot image instead of the compiled classes version. Results using profile from ag/2815407 Storage savings: Boot art+vdex+oat size: 78305556->61539326 (-17MB) New system server profile has more methods (1.5MB -> 4MB oat) since it has more coverage from use cases. Ram savings (sample averages for CUJ test): Average PSS of 3 runs (~100 samples total): .Boot_vdex: 9359K -> 9902K .oat_mmap: 21857K -> 13372K .Heap: 29779K -> 29483K .Boot_art: 15736K -> 18096K .LinearAlloc: 9112K -> 8965K Total PSS: 85846K -> 79819K (-6MB) Average pages read from flash (512MB device) for CUJ tests (3 samples): 1508MB -> 1183MB Bug: 37966211 Test: make and flash (cherry-picked from commit bf9023ae7a0573dc6473ebe8ca15d5516d4a649d) Change-Id: Icf3039ef871b68d806ef7b7c8ad2220c3a37ce90 Merged-In: Id8f9b08490a50e2ccf39e8acc00b0c4e8ec782b0 --- core/dex_preopt_libart.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 79e72c15f..dbdda8b01 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -94,7 +94,7 @@ LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat boot.vdex 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 +my_use_profile_for_boot_image := true endif ifeq (true,$(my_use_profile_for_boot_image)) From 8fd29b365358e0c4169626482c5d3f5d1cdd083b Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 24 Oct 2017 15:22:57 -0700 Subject: [PATCH 2/2] Don't default my_use_profile_for_boot_image to true for PDK builds This causes an unsatisfiable dependency on frameworks/base. Bug: 67663308 Test: make (cherry-picked from commit 83bae866e6fe51cd2d6883a8cec29445e1c094f7) Change-Id: Iba0c3893b49386591f84eb893abf0b577b9716a0 Merged-In: I06e45e8ca66ab6547bf1df25119dda80d44e50f6 --- core/dex_preopt_libart.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index dbdda8b01..20d43dcfa 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -93,9 +93,12 @@ 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. +# If not set, set the default to true if we are not a PDK build. PDK builds +# can't build the profile since they don't have frameworks/base. +ifneq (true,$(TARGET_BUILD_PDK)) my_use_profile_for_boot_image := true endif +endif ifeq (true,$(my_use_profile_for_boot_image))