Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a7fcb00 authored by Ying Wang's avatar Ying Wang Committed by Jeff Hao
Browse files

Introduce per-product per-module dex-preopt config 

- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
  arbitrary dex-preopt config/flags to modules in product
  configuration:
  $(call \
  add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
  How <config_or_flags> is interpreted is decided by
  dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
  disable dexpreopt for the given modules; otherwise pass it to dex2oat as
  command line flags.
- If there are multiple configs for the same module in the product
  inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
  dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.

Bug: 17791867
(cherry picked from commit 20ebd2ef)

(cherry picked from commit 70d617aa)

Change-Id: I86f125dd02290d0969704142a4405ebd6729c4f7
parent be9f16d0

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ LOCAL_RENDERSCRIPT_SKIP_INSTALL:= 
LOCAL_RENDERSCRIPT_TARGET_API:=

LOCAL_DEX_PREOPT:= # '',true,false,nostripping

LOCAL_DEX_PREOPT_IMAGE_LOCATION:=

LOCAL_DEX_PREOPT_FLAGS:=

LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full

LOCAL_PROTOC_FLAGS:=

LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=

core/dex_preopt_libart.mk

+2 −1
Original line number Diff line number Diff line
@@ -91,5 +91,6 @@ $(hide) $(DEX2OATD) \ 
	--android-root=$(PRODUCT_OUT)/system \

	--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \

	--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \

	--include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols

	--include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \

	$(PRIVATE_DEX_PREOPT_FLAGS)

endef

core/dex_preopt_libart_boot.mk

+2 −1
Original line number Diff line number Diff line
@@ -53,4 +53,5 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
		--image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \

		--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \

		--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \

		--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols
 
		--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \

		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS)

core/dex_preopt_odex_install.mk

+14 −1
Original line number Diff line number Diff line
@@ -11,7 +11,12 @@ else # WITH_DEXPREOPT=true 
    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
@@ -94,6 +99,14 @@ endif # libart 
endif  # boot jar



ifdef built_odex

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

$(built_odex): PRIVATE_DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)



# Use pattern rule - we may have multiple installed odex files.

# Ugly syntax - See the definition get-odex-file-path.

$(installed_odex) : $(dir $(LOCAL_INSTALLED_MODULE))%$(notdir $(word 1,$(installed_odex))) \

core/product.mk

+17 −2
Original line number Diff line number Diff line
@@ -100,14 +100,18 @@ _product_var_list := \ 
    PRODUCT_FACTORY_BUNDLE_MODULES \

    PRODUCT_RUNTIMES \

    PRODUCT_BOOT_JARS \

    PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \

    PRODUCT_SUPPORTS_VERITY \

    PRODUCT_OEM_PROPERTIES \

    PRODUCT_SYSTEM_PROPERTY_BLACKLIST \

    PRODUCT_SYSTEM_SERVER_JARS \

    PRODUCT_VERITY_SIGNING_KEY \

    PRODUCT_SYSTEM_VERITY_PARTITION \

    PRODUCT_VENDOR_VERITY_PARTITION

    PRODUCT_VENDOR_VERITY_PARTITION \

    PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \

    PRODUCT_DEX_PREOPT_MODULE_CONFIGS \

    PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \

    PRODUCT_DEX_PREOPT_BOOT_FLAGS \





define dump-product

$(info ==== $(1) ====)\
@@ -299,3 +303,14 @@ endef 
define add-to-product-copy-files-if-exists

$(if $(wildcard $(word 1,$(subst :, ,$(1)))),$(1))

endef



# whitespace placeholder when we record module's dex-preopt config.

_PDPMC_SP_PLACE_HOLDER := |@SP@|

# Set up dex-preopt config for a module.

# $(1) list of module names

# $(2) the modules' dex-preopt config

define add-product-dex-preopt-module-config

$(eval _c := $(subst $(space),$(_PDPMC_SP_PLACE_HOLDER),$(strip $(2))))\

$(eval PRODUCT_DEX_PREOPT_MODULE_CONFIGS += \

  $(foreach m,$(1),$(m)=$(_c)))

endef