From 21b481b757e5599fec65a6a2ab573313b9def713 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 15 Apr 2016 16:27:17 -0700
Subject: [PATCH] Update sanitize property format

Change-Id: Ibca493a70a19cd3dfb58b5404b1c9ed42e068748
---
 cc/cc.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/cc/cc.go b/cc/cc.go
index 5adaf49f0..1c1ef10e6 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -406,12 +406,20 @@ type InstallerProperties struct {
 }
 
 type UnusedProperties struct {
-	Native_coverage  *bool
-	Required         []string
-	Sanitize         []string `android:"arch_variant"`
-	Sanitize_recover []string
-	Strip            string
-	Tags             []string
+	Native_coverage *bool
+	Required        []string
+	Strip           string
+	Tags            []string
+	Sanitize        struct {
+		Never          bool     `android:"arch_variant"`
+		Address        bool     `android:"arch_variant"`
+		Thread         bool     `android:"arch_variant"`
+		Undefined      bool     `android:"arch_variant"`
+		All_undefined  bool     `android:"arch_variant"`
+		Misc_undefined []string `android:"arch_variant"`
+		Coverage       bool     `android:"arch_variant"`
+		Recover        []string
+	} `android:"arch_variant"`
 }
 
 type ModuleContextIntf interface {