From 6f21a29a2cc672d7c10ef6c94cd18d16281fd0f7 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 4 Oct 2016 22:24:17 -0700 Subject: [PATCH] Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS These are exported by Soong. Caught by an upcoming change to mark Soong-exported variables as readonly. Test: Manual checking that the values are still the same. Change-Id: I18e2bca588c57809c16a9f0c386aad432bfbee2c --- core/dex_preopt_libart.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 5a2f07f15..ab54b1d8e 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -25,10 +25,6 @@ PRELOADED_CLASSES := $(call word-colon,1,$(firstword \ COMPILED_CLASSES := $(call word-colon,1,$(firstword \ $(filter %system/etc/compiled-classes,$(PRODUCT_COPY_FILES)))) -# start of image reserved address space -LIBART_IMG_HOST_BASE_ADDRESS := 0x60000000 -LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000 - define get-product-default-property $(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES)))) endef @@ -45,7 +41,6 @@ ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),mips mips64)) # building the image. We therefore limit the Xmx value. This isn't done # via a property as we want the larger Xmx value if we're running on a # MIPS device. -LIBART_IMG_TARGET_BASE_ADDRESS := 0x30000000 DEX2OAT_XMX := 128m endif