commit a20910f49587fba5fe84dd94eb25aa6d5399e2c4
author Andreas Gampe <agampe@google.com> Fri Apr 29 14:34:10 2016 -0700
committer Andreas Gampe <agampe@google.com> Mon May 09 22:42:27 2016 +0000
tree 59bd606cc917f55f50808de2fb96e9934b0e04ee
parent 6e034af238a677db70bc0b10f7f9e08bc8b8aef9

Build: Switch on oat file mini-debug-info for boot.oat

Enable mini-debug-info for the boot image by default. This
can be disabled with WITH_DEXPREOPT_DEBUG_INFO=false.

Bug: 28474219

(cherry picked from commit 58f6bfaa37946835b3a4da279e4e4743181da159)

Change-Id: Ifd59d854f01ad8cf703f16d7a6e88c2c82d47feb

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index a36d4f9..d182dc0 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -29,6 +29,10 @@
   ifeq (eng,$(TARGET_BUILD_VARIANT))
     WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true
   endif
+# Add mini-debug-info to the boot classpath unless explicitly asked not to.
+  ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))
+    PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info
+  endif
 endif
 
 GLOBAL_DEXPREOPT_FLAGS :=