diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/dex_preopt.mk | 9 | ||||
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 15 | ||||
| -rw-r--r-- | core/java_library.mk | 6 | ||||
| -rw-r--r-- | core/main.mk | 12 | ||||
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rw-r--r-- | core/product_config.mk | 30 |
6 files changed, 9 insertions, 64 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 231a04e5f..8b555e090 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -3,8 +3,6 @@ # #################################### -ifneq ($(DALVIK_VM_LIB),) - # list of boot classpath jars for dexpreopt DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS)) DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS) @@ -18,6 +16,9 @@ DEXPREOPT_PRODUCT_DIR := $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(DEXPREOPT_PRODU DEXPREOPT_BOOT_JAR_DIR := system/framework DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR) +# The default value for LOCAL_DEX_PREOPT +DEX_PREOPT_DEFAULT ?= true + # $(1): the .jar or .apk to remove classes.dex define dexpreopt-remove-classes.dex $(hide) zip --quiet --delete $(1) classes.dex; \ @@ -60,7 +61,3 @@ DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEFAULT_DEX_PREOPT_BUILT_IM ifdef TARGET_2ND_ARCH $(TARGET_2ND_ARCH_VAR_PREFIX)DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) endif # TARGET_2ND_ARCH -else -$(warning No DALVIK_VM_LIB, disable dexpreopt.) -WITH_DEXPREOPT := false -endif # DALVIK_VM_LIB is defined. diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 20bbe78b1..aef5cd185 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -46,26 +46,12 @@ built_installed_odex := ifdef LOCAL_DEX_PREOPT dexpreopt_boot_jar_module := $(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)) ifdef dexpreopt_boot_jar_module -ifeq ($(DALVIK_VM_LIB),libdvm.so) -built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex -installed_odex := $(basename $(LOCAL_INSTALLED_MODULE)).odex -built_installed_odex := $(built_odex):$(installed_odex) -else # libdvm.so # 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) -endif # libdvm.so else # boot jar -ifeq ($(DALVIK_VM_LIB),libdvm.so) -built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex -installed_odex := $(basename $(LOCAL_INSTALLED_MODULE)).odex -built_installed_odex := $(built_odex):$(installed_odex) - -$(built_odex) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT) \ - $(DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS) -else # libart ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) # For a Java library, we build odex for both 1st arch and 2nd arch, if we have one. # ################################################# @@ -91,7 +77,6 @@ include $(BUILD_SYSTEM)/setup_one_odex.mk endif # LOCAL_MULTILIB is both endif # TARGET_2ND_ARCH endif # LOCAL_MODULE_CLASS -endif # libart endif # boot jar ifdef built_odex diff --git a/core/java_library.mk b/core/java_library.mk index dffc7d90a..5f7c784ac 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -85,12 +85,6 @@ $(LOCAL_BUILT_MODULE) : $(dexpreopted_boot_jar) | $(ACP) $(call copy-file-to-target) # For libart boot jars, we don't have .odex files. -ifeq ($(DALVIK_VM_LIB),libdvm.so) -dexpreopted_boot_odex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(dexpreopt_boot_jar_module).odex -$(built_odex) : $(dexpreopted_boot_odex) | $(ACP) - $(call copy-file-to-target) -endif - else # ! boot jar $(built_odex): PRIVATE_MODULE := $(LOCAL_MODULE) # Use pattern rule - we may have multiple built odex files. diff --git a/core/main.mk b/core/main.mk index 53df32c06..4fbd01e2f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -307,6 +307,7 @@ endif # Add build properties for ART. These define system properties used by installd # to pass flags to dex2oat. +ADDITIONAL_BUILD_PROPERTIES += persist.sys.dalvik.vm.lib.2=libart ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).variant=$(DEX2OAT_TARGET_CPU_VARIANT) ifneq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),) ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) @@ -336,15 +337,14 @@ ifneq (,$(user_variant)) enable_target_debugging := endif - # Turn on Dalvik preoptimization for libdvm.so user builds, but only if not + # Turn on Dalvik preoptimization for user builds, but only if not # explicitly disabled and the build is running on Linux (since host # Dalvik isn't built for non-Linux hosts). ifeq (,$(WITH_DEXPREOPT)) - ifeq ($(DALVIK_VM_LIB),libdvm.so) - ifeq ($(user_variant),user) - ifeq ($(HOST_OS),linux) - WITH_DEXPREOPT := true - endif + ifeq ($(user_variant),user) + ifeq ($(HOST_OS),linux) + # TODO: turn on WITH_DEXPREOPT for libart user builds. + # WITH_DEXPREOPT := true endif endif endif diff --git a/core/product.mk b/core/product.mk index 153629cdf..6a1091a0f 100644 --- a/core/product.mk +++ b/core/product.mk @@ -99,7 +99,6 @@ _product_var_list := \ PRODUCT_VENDOR_KERNEL_HEADERS \ PRODUCT_FACTORY_RAMDISK_MODULES \ PRODUCT_FACTORY_BUNDLE_MODULES \ - PRODUCT_RUNTIMES \ PRODUCT_BOOT_JARS \ PRODUCT_SUPPORTS_VERITY \ PRODUCT_OEM_PROPERTIES \ diff --git a/core/product_config.mk b/core/product_config.mk index e59aee158..7476e0935 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -248,36 +248,6 @@ all_product_configs := ############################################################################# -# TODO: Remove this hack once only 1 runtime is left. -# Include the runtime product makefile based on the product's PRODUCT_RUNTIMES -$(call clear-var-list, $(_product_var_list)) - -# Set PRODUCT_RUNTIMES, allowing buildspec to override using OVERRIDE_RUNTIMES -product_runtimes := $(sort $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RUNTIMES)) -ifneq ($(OVERRIDE_RUNTIMES),) - $(info Overriding PRODUCT_RUNTIMES=$(product_runtimes) with $(OVERRIDE_RUNTIMES)) - product_runtimes := $(OVERRIDE_RUNTIMES) -endif -$(foreach runtime, $(product_runtimes), $(eval include $(SRC_TARGET_DIR)/product/$(runtime).mk)) -$(foreach v, $(_product_var_list), $(if $($(v)),\ - $(eval PRODUCTS.$(INTERNAL_PRODUCT).$(v) += $(sort $($(v)))))) - -$(call clear-var-list, $(_product_var_list)) -# Now we can assign to PRODUCT_RUNTIMES -PRODUCT_RUNTIMES := $(product_runtimes) -product_runtimes := - -PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES += persist.sys.dalvik.vm.lib.2=$(DALVIK_VM_LIB) - -ifeq ($(words $(PRODUCT_RUNTIMES)),1) - # If we only have one runtime, we can strip classes.dex by default during dex_preopt - DEX_PREOPT_DEFAULT := true -else - # If we have more than one, we leave the classes.dex alone for post-boot analysis - DEX_PREOPT_DEFAULT := nostripping -endif - -############################################################################# # A list of module names of BOOTCLASSPATH (jar files) PRODUCT_BOOT_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS)) |