From: Evgenii Stepanov <eugenis@google.com>
Date: Mon, 6 Jul 2015 23:20:48 +0000 (+0000)
Subject: Merge "Disable sanitization of dex2oat on device."
X-Git-Tag: android-x86-7.1-r1~889^2~819
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb5965c8891c748a30120ff20e873bbfe2dbf5d5;p=android-x86%2Fart.git

Merge "Disable sanitization of dex2oat on device."
---

bb5965c8891c748a30120ff20e873bbfe2dbf5d5
diff --cc dex2oat/Android.mk
index d27ee3efa,0f0a39625..2c906234a
--- a/dex2oat/Android.mk
+++ b/dex2oat/Android.mk
@@@ -47,15 -55,10 +56,17 @@@ endi
  
  # We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
  ifeq ($(ART_BUILD_HOST_NDEBUG),true)
 -  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler libziparchive-host,art/compiler,host,ndebug,$(dex2oat_host_arch)))
 +  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler libsigchain libziparchive-host,art/compiler,host,ndebug,$(dex2oat_host_arch)))
 +  ifeq ($(ART_BUILD_HOST_STATIC),true)
 +    $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart libart-compiler libart libziparchive-host libnativehelper libnativebridge libsigchain_dummy libvixl liblog libz libbacktrace libcutils libunwindbacktrace libutils libbase,art/compiler,host,ndebug,$(dex2oat_host_arch),static))
 +  endif
  endif
 +
  ifeq ($(ART_BUILD_HOST_DEBUG),true)
 -  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler libziparchive-host,art/compiler,host,debug,$(dex2oat_host_arch)))
 +  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler libsigchain libziparchive-host,art/compiler,host,debug,$(dex2oat_host_arch)))
 +  ifeq ($(ART_BUILD_HOST_STATIC),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