StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ba40c3cd29

* commit 'ba40c3cd295f3c2250d3cd92d1d59d694ea57f89':
  USE_SAFESTACK support in Soong.

Change-Id: I3f79ad1ab904b29d973f21475450d6d3f040d399
This commit is contained in:
Evgenii Stepanov
2016-05-16 20:27:38 +00:00
committed by android-build-merger
parent 9ae54cfc34 ba40c3cd29
commit 7273314d93
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/variable.go
View File

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