commit 75c08b2118945dec9b2f0c51f1e7e7ee8db58756
author Nicolas Geoffray <ngeoffray@google.com> Mon Oct 06 14:53:59 2014 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Oct 07 08:30:18 2014 +0000
tree 2caa3c4ecfd8ab6ada1cff37abeb442639718c23
parent 9979ae4370e7acd4b305fddeca3c24495214a0cf

Make which dex2oat version to use configurable.

Change-Id: Ic13cf6f9dfb117193a5101781945c501d138955c

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 5af2be2..0e17240 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -18,6 +18,13 @@
 
 PRELOADED_CLASSES := frameworks/base/preloaded-classes
 
+# Default to debug version to help find bugs.
+# Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.
+ifneq ($(USE_DEX2OAT_DEBUG), false)
+DEX2OAT = $(DEX2OATD)
+DEX2OAT_DEPENDECY = $(DEX2OATD_DEPENDENCY)
+endif
+
 # start of image reserved address space
 LIBART_IMG_HOST_BASE_ADDRESS   := 0x60000000
 LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000
@@ -82,7 +89,7 @@
 define dex2oat-one-file
 $(hide) rm -f $(2)
 $(hide) mkdir -p $(dir $(2))
-$(hide) $(DEX2OATD) \
+$(hide) $(DEX2OAT) \
 	--runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \
 	--boot-image=$(PRIVATE_DEX_PREOPT_IMAGE_LOCATION) \
 	--dex-file=$(1) \