From ed6ee7b64d34029c538d9697bf2fec2078cbea05 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 18 Jan 2018 15:47:23 +0000 Subject: [PATCH] Don't strip for eng builds. bug: 72150787 Test: m Change-Id: Ifdd403dfecb440e32c4d0c00a7543820b2098359 --- core/dex_preopt.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 0dcb07fd1..83c4a9523 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -35,12 +35,14 @@ endif # Conditional to building on linux, as dex2oat currently does not work on darwin. ifeq ($(HOST_OS),linux) WITH_DEXPREOPT ?= true -# For an eng build only pre-opt the boot image and system server. This gives reasonable performance -# and still allows a simple workflow: building in frameworks/base and syncing. ifeq (eng,$(TARGET_BUILD_VARIANT)) + # Don't strip for quick development turnarounds. + DEX_PREOPT_DEFAULT := nostripping + # For an eng build only pre-opt the boot image and system server. This gives reasonable performance + # and still allows a simple workflow: building in frameworks/base and syncing. WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true endif -# Add mini-debug-info to the boot classpath unless explicitly asked not to. + # 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