From: Evgenii Stepanov <eugenis@google.com>
Date: Tue, 27 Sep 2016 20:51:41 +0000 (+0000)
Subject: Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG."
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2358c55d704a48d4d82ff2a00f4ddf7fe5716b47;p=android-x86%2Fbuild.git

Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG."
---

2358c55d704a48d4d82ff2a00f4ddf7fe5716b47
diff --cc core/clear_vars.mk
index 4f0c83928,d46dff317..0f3ecc363
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@@ -197,8 -191,8 +197,9 @@@ LOCAL_DPI_VARIANTS:
  LOCAL_DPI_FILE_STEM:=
  LOCAL_SANITIZE:=
  LOCAL_SANITIZE_RECOVER:=
+ LOCAL_SANITIZE_DIAG:=
  LOCAL_NOSANITIZE:=
 +LOCAL_DATA_BINDING:=
  LOCAL_DBUS_PROXY_PREFIX:=
  LOCAL_INIT_RC:=
  LOCAL_MODULE_SYMLINKS:=