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

Merge "Support sanitizing a single device arch"

Browse Source
This commit is contained in:
Treehugger Robot
2016-11-03 07:12:53 +00:00
committed by Gerrit Code Review
parent eb716e2559 23ae82a2b2
commit 42e04de8a7
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/config.go
View File

@@ -357,17 +357,15 @@ func (c *config) SkipDeviceInstall() bool {
} }
func (c *config) SanitizeHost() []string { func (c *config) SanitizeHost() []string {
if c.ProductVariables.SanitizeHost == nil { return append([]string(nil), c.ProductVariables.SanitizeHost...)
return nil
}
return append([]string(nil), *c.ProductVariables.SanitizeHost...)
} }
func (c *config) SanitizeDevice() []string { func (c *config) SanitizeDevice() []string {
if c.ProductVariables.SanitizeDevice == nil { return append([]string(nil), c.ProductVariables.SanitizeDevice...)
return nil }
}
return append([]string(nil), *c.ProductVariables.SanitizeDevice...) func (c *config) SanitizeDeviceArch() []string {
return append([]string(nil), c.ProductVariables.SanitizeDeviceArch...)
} }
func (c *config) Android64() bool { func (c *config) Android64() bool {

5
android/variable.go
View File

@@ -118,8 +118,9 @@ type productVariables struct {
DevicePrefer32BitExecutables *bool `json:",omitempty"` DevicePrefer32BitExecutables *bool `json:",omitempty"`
HostPrefer32BitExecutables *bool `json:",omitempty"` HostPrefer32BitExecutables *bool `json:",omitempty"`
SanitizeHost *[]string `json:",omitempty"` SanitizeHost []string `json:",omitempty"`
SanitizeDevice *[]string `json:",omitempty"` SanitizeDevice []string `json:",omitempty"`
SanitizeDeviceArch []string `json:",omitempty"`
} }
func boolPtr(v bool) *bool { func boolPtr(v bool) *bool {

3
cc/sanitize.go
View File

@@ -119,9 +119,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
if ctx.Host() { if ctx.Host() {
globalSanitizers = ctx.AConfig().SanitizeHost() globalSanitizers = ctx.AConfig().SanitizeHost()
} else { } else {
arches := ctx.AConfig().SanitizeDeviceArch()
if len(arches) == 0 || inList(ctx.Arch().ArchType.Name, arches) {
globalSanitizers = ctx.AConfig().SanitizeDevice() globalSanitizers = ctx.AConfig().SanitizeDevice()
} }
} }
}
if len(globalSanitizers) > 0 { if len(globalSanitizers) > 0 {
var found bool var found bool