From d3fe49289d97180ce844afd8a4002d4d6c790d22 Mon Sep 17 00:00:00 2001
From: Cindy Zhou <zhouci@google.com>
Date: Tue, 1 Dec 2020 11:14:30 -0800
Subject: [PATCH] Add arch_variant support for diag

Allow for different arch to specify sanitizer options.

Bug: 158010610
Test: Compiles with build options
Change-Id: I4db72f682e920e3c1a6d55473f316e56567636e6
---
 cc/sanitize.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cc/sanitize.go b/cc/sanitize.go
index dbc52a506..22ee25fdf 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -169,14 +169,14 @@ type SanitizeUserProps struct {
 		Cfi              *bool    `android:"arch_variant"`
 		Integer_overflow *bool    `android:"arch_variant"`
 		Misc_undefined   []string `android:"arch_variant"`
-		No_recover       []string
-	}
+		No_recover       []string `android:"arch_variant"`
+	} `android:"arch_variant"`
 
 	// Sanitizers to run with flag configuration specified
 	Config struct {
 		// Enables CFI support flags for assembly-heavy libraries
 		Cfi_assembly_support *bool `android:"arch_variant"`
-	}
+	} `android:"arch_variant"`
 
 	// value to pass to -fsanitize-recover=
 	Recover []string