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

Commit a18a2830 authored by Ian Rogers's avatar Ian Rogers
Browse files

Pass instruction set variant to dex2oat. 

Also, add it to the ANDROID_BUILD_PROPERTIES.
Remove non-default instruction set features.
Bug: 18056890

Change-Id: I9169cdfecbb176f62b941852948222edc3f511fd
parent ebc32090

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -541,17 +541,11 @@ TARGET_CPU_SMP ?= true 
DEX2OAT_TARGET_ARCH := $(TARGET_ARCH)

DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)

DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default

ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))

  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div

endif



ifdef TARGET_2ND_ARCH

$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH := $(TARGET_2ND_ARCH)

$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_2ND_CPU_VARIANT)

$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default

ifneq (,$(filter $($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))

  $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div

endif

endif



# define clang/llvm tools and global flags

core/dex_preopt_libart.mk

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ $(hide) $(DEX2OAT) \ 
	--oat-file=$(2) \

	--android-root=$(PRODUCT_OUT)/system \

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

	--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \

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

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

	$(PRIVATE_DEX_PREOPT_FLAGS)

core/dex_preopt_libart_boot.mk

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
		--oat-location=$(patsubst %.art,%.oat,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_BOOT_IMAGE_FILENAME)) \

		--image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \

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

		--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \

		--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 \

		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS)

core/main.mk

+11 −2
Original line number Diff line number Diff line
@@ -305,10 +305,19 @@ ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),) 
is_sdk_build := true

endif



# Add build properties for ART. These define system properties used by installd

# to pass flags to dex2oat.

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)

endif



ifdef TARGET_2ND_ARCH

  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_2ND_ARCH).variant=$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT)

  ifneq ($($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),)

    ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_2ND_ARCH).features=$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)

  endif

endif



## user/userdebug ##