Merge "Move ART cpu properties to /vendor" am: b5312392a0 (8fae4702) · Commits · e / os / android_build

core/Makefile

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -181,11 +181,25 @@ endif
	FINAL_VENDOR_DEFAULT_PROPERTIES += \		FINAL_VENDOR_DEFAULT_PROPERTIES += \
	$(call collapse-pairs, $(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))		$(call collapse-pairs, $(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))

			# Add cpu properties for bionic and ART.
	FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.arch=$(TARGET_ARCH)		FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.arch=$(TARGET_ARCH)
	FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.cpu_variant=$(TARGET_CPU_VARIANT)		FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.cpu_variant=$(TARGET_CPU_VARIANT)
	FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.2nd_arch=$(TARGET_2ND_ARCH)		FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.2nd_arch=$(TARGET_2ND_ARCH)
	FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.2nd_cpu_variant=$(TARGET_2ND_CPU_VARIANT)		FINAL_VENDOR_DEFAULT_PROPERTIES += ro.bionic.2nd_cpu_variant=$(TARGET_2ND_CPU_VARIANT)

			FINAL_VENDOR_DEFAULT_PROPERTIES += persist.sys.dalvik.vm.lib.2=libart.so
			FINAL_VENDOR_DEFAULT_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).variant=$(DEX2OAT_TARGET_CPU_VARIANT)
			ifneq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),)
			FINAL_VENDOR_DEFAULT_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
			endif

			ifdef TARGET_2ND_ARCH
			FINAL_VENDOR_DEFAULT_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),)
			FINAL_VENDOR_DEFAULT_PROPERTIES += dalvik.vm.isa.$(TARGET_2ND_ARCH).features=$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
			endif
			endif

	# Although these variables are prefixed with TARGET_RECOVERY_, they are also needed under charger		# Although these variables are prefixed with TARGET_RECOVERY_, they are also needed under charger
	# mode (via libminui).		# mode (via libminui).
	ifdef TARGET_RECOVERY_DEFAULT_ROTATION		ifdef TARGET_RECOVERY_DEFAULT_ROTATION

core/main.mk

+5 −20

Original line number	Original line	Diff line number	Diff line
	@@ -252,6 +252,11 @@ ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)
	ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.dynamic_partitions_retrofit=true		ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.dynamic_partitions_retrofit=true
	endif		endif

			# Add the system server compiler filter if they are specified for the product.
			ifneq (,$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))
			ADDITIONAL_PRODUCT_PROPERTIES += dalvik.vm.systemservercompilerfilter=$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)
			endif

	# -----------------------------------------------------------------		# -----------------------------------------------------------------
	###		###
	### In this section we set up the things that are different		### In this section we set up the things that are different
	@@ -264,26 +269,6 @@ ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),)
	is_sdk_build := true		is_sdk_build := true
	endif		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.so
	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

	# 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/userdebug ##

	user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))		user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))