From 461d72a0be54129882f0c43ee8b50091366f1ede Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Thu, 11 Jun 2015 01:27:56 +0100 Subject: [PATCH] Generate debug info for core.oat files. The debug info is needed for CFI unwinding tests. I am adding this as part of investigating build bot failure, I suspect the it might not be generating the debug info by default. Change-Id: Ic0cdda345355161d44949308d6d70ff59542cc1e --- build/Android.oat.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 710b13028..728469c2c 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -113,7 +113,7 @@ $$(core_image_name): $$(HOST_CORE_DEX_LOCATIONS) $$(core_dex2oat_dependency) --oat-location=$$(PRIVATE_CORE_OAT_NAME) --image=$$(PRIVATE_CORE_IMG_NAME) \ --base=$$(LIBART_IMG_HOST_BASE_ADDRESS) --instruction-set=$$($(3)ART_HOST_ARCH) \ --instruction-set-features=$$($(3)DEX2OAT_HOST_INSTRUCTION_SET_FEATURES) \ - --host --android-root=$$(HOST_OUT) --include-patch-information \ + --host --android-root=$$(HOST_OUT) --include-patch-information --generate-debug-info \ $$(PRIVATE_CORE_COMPILE_OPTIONS) $$(core_oat_name): $$(core_image_name) @@ -232,7 +232,7 @@ $$(core_image_name): $$(TARGET_CORE_DEX_FILES) $$(core_dex2oat_dependency) --base=$$(LIBART_IMG_TARGET_BASE_ADDRESS) --instruction-set=$$($(3)TARGET_ARCH) \ --instruction-set-variant=$$($(3)DEX2OAT_TARGET_CPU_VARIANT) \ --instruction-set-features=$$($(3)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ - --android-root=$$(PRODUCT_OUT)/system --include-patch-information \ + --android-root=$$(PRODUCT_OUT)/system --include-patch-information --generate-debug-info \ $$(PRIVATE_CORE_COMPILE_OPTIONS) || (rm $$(PRIVATE_CORE_OAT_NAME); exit 1) $$(core_oat_name): $$(core_image_name) -- 2.11.0