diff options
author | David Srbecky <dsrbecky@google.com> | 2015-05-28 16:32:55 +0100 |
---|---|---|
committer | David Srbecky <dsrbecky@google.com> | 2015-06-19 02:34:58 +0100 |
commit | ab139752196bafa9e43ed0a273b9a267e95e7eb2 (patch) | |
tree | ef242e9a660a9caff47ee9d57c151e322bf9f9f9 /core | |
parent | 5aa6832e6b5dc4274066346f4dbab93c17145577 (diff) | |
download | build-ab139752196bafa9e43ed0a273b9a267e95e7eb2.zip build-ab139752196bafa9e43ed0a273b9a267e95e7eb2.tar.gz build-ab139752196bafa9e43ed0a273b9a267e95e7eb2.tar.bz2 |
Pass --no-generate-debug-info to dex2oat.
The two flags have been merged and renamed in ART.
(cherry picked from commit d8fae9a6a64dfa910d68d57fc820c1b1e4150f88)
Bug: 21924613
Change-Id: Iffc1dcc6764367239d6f45a3598cdb2c5d5d5013
Diffstat (limited to 'core')
-rw-r--r-- | core/dex_preopt_libart.mk | 2 | ||||
-rw-r--r-- | core/dex_preopt_libart_boot.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 6f598be..1de72b7 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -105,7 +105,7 @@ $(hide) $(DEX2OAT) \ --instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \ --instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \ --instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ - --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols --no-include-cfi \ + --include-patch-information --runtime-arg -Xnorelocate --no-generate-debug-info \ --abort-on-hard-verifier-error \ $(PRIVATE_DEX_PREOPT_FLAGS) endef diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index cfc7653..afd61eb 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -62,5 +62,5 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE --instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \ --instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \ --instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ - --android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols --no-include-cfi \ + --android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-generate-debug-info \ $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(COMPILED_CLASSES_FLAGS) |