Merge "USE_SAFESTACK support in Soong." am: 6e39d270fa

am: ba40c3cd29

* commit 'ba40c3cd295f3c2250d3cd92d1d59d694ea57f89':
  USE_SAFESTACK support in Soong.

Change-Id: I3f79ad1ab904b29d973f21475450d6d3f040d399

common/variable.go

@@ -46,6 +46,10 @@ type variableProperties struct {
 		Malloc_not_svelte struct {
 			Cflags []string
 		}
+
+		Safestack struct {
+			Cflags []string `android:"arch_variant"`
+		} `android:"arch_variant"`
 	} `android:"arch_variant"`
 }
 
@@ -80,6 +84,7 @@ type productVariables struct {
 	Unbundled_build            *bool `json:",omitempty"`
 	Brillo                     *bool `json:",omitempty"`
 	Malloc_not_svelte          *bool `json:",omitempty"`
+	Safestack                  *bool `json:",omitempty"`
 
 	SanitizeHost   *[]string `json:",omitempty"`
 	SanitizeDevice *[]string `json:",omitempty"`
@@ -113,6 +118,7 @@ func (v *productVariables) SetDefaultConfig() {
 		DeviceSecondaryCpuVariant:  stringPtr("denver"),
 		DeviceSecondaryAbi:         &[]string{"armeabi-v7a"},
 		Malloc_not_svelte:          boolPtr(false),
+		Safestack:                  boolPtr(false),
 	}
 
 	if runtime.GOOS == "linux" {