diff options
| author | 2015-07-06 23:20:48 +0000 | |
|---|---|---|
| committer | 2015-07-06 23:20:49 +0000 | |
| commit | bb5965c8891c748a30120ff20e873bbfe2dbf5d5 (patch) | |
| tree | c1bc19ef022cbd03ec0c1e98a771052e635595ef | |
| parent | 288b30015d136a81e5899439c398ca476e332006 (diff) | |
| parent | c2f0474b90ee62fce1e538bfbfde4a609885b258 (diff) | |
Merge "Disable sanitization of dex2oat on device."
| -rw-r--r-- | dex2oat/Android.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index d27ee3efa6..2c906234ab 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -14,6 +14,15 @@ # limitations under the License. # +# ASan slows down dex2oat by ~3.5x, which translates into extremely slow first +# boot. Disabled to help speed up SANITIZE_TARGET mode. +# The supported way of using SANITIZE_TARGET is by first running a normal build, +# followed by a SANITIZE_TARGET=address build on top of it (in the same build +# tree). By disabling this module in SANITIZE_TARGET build, we keep the regular, +# uninstrumented version of it. +# Bug: 22233158 +ifneq (address,$(strip $(SANITIZE_TARGET))) + LOCAL_PATH := $(call my-dir) include art/build/Android.executable.mk @@ -59,3 +68,5 @@ ifeq ($(ART_BUILD_HOST_DEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd libartd-compiler libartd libziparchive-host libnativehelper libnativebridge libsigchain_dummy libvixld liblog libz libbacktrace libcutils libunwindbacktrace libutils libbase,art/compiler,host,debug,$(dex2oat_host_arch),static)) endif endif + +endif |