From b43a159c13c47495d64089821f6b0bfd49ebd237 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 16 Sep 2015 14:00:32 -0700
Subject: [PATCH] Replace asan with sanitize

LOCAL_ADDRESS_SANITIZER has been replaced with LOCAL_SANITIZE.

Change-Id: I81fe7e0c9135cfd4a222fae4012ab5082cc58f29
---
 androidmk/cmd/androidmk/android.go |  3 ++-
 cc/cc.go                           | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 8d7025c33..d76e6844a 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -48,6 +48,8 @@ var standardProperties = map[string]struct {
 	"LOCAL_LDLIBS":                  {"host_ldlibs", bpparser.List},
 	"LOCAL_CLANG_CFLAGS":            {"clang_cflags", bpparser.List},
 	"LOCAL_YACCFLAGS":               {"yaccflags", bpparser.List},
+	"LOCAL_SANITIZE":                {"sanitize", bpparser.List},
+	"LOCAL_SANITIZE_RECOVER":        {"sanitize_recover", bpparser.List},
 
 	"LOCAL_JAVA_RESOURCE_DIRS":    {"java_resource_dirs", bpparser.List},
 	"LOCAL_JAVACFLAGS":            {"javacflags", bpparser.List},
@@ -62,7 +64,6 @@ var standardProperties = map[string]struct {
 	"LOCAL_IS_HOST_MODULE":          {"host", bpparser.Bool},
 	"LOCAL_CLANG":                   {"clang", bpparser.Bool},
 	"LOCAL_FORCE_STATIC_EXECUTABLE": {"static", bpparser.Bool},
-	"LOCAL_ADDRESS_SANITIZER":       {"asan", bpparser.Bool},
 	"LOCAL_NATIVE_COVERAGE":         {"native_coverage", bpparser.Bool},
 	"LOCAL_NO_CRT":                  {"nocrt", bpparser.Bool},
 	"LOCAL_ALLOW_UNDEFINED_SYMBOLS": {"allow_undefined_symbols", bpparser.Bool},
diff --git a/cc/cc.go b/cc/cc.go
index 7f4006675..ba3dd2843 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -318,11 +318,12 @@ type CCBase struct {
 	Properties CCBaseProperties
 
 	unused struct {
-		Asan            bool
-		Native_coverage bool
-		Strip           string
-		Tags            []string
-		Required        []string
+		Native_coverage  bool
+		Required         []string
+		Sanitize         []string
+		Sanitize_recover []string
+		Strip            string
+		Tags             []string
 	}
 
 	installPath string