Merge \"Return copies of global sanitizer slices\"

am: da84958b15

Change-Id: Ic442ac5727c1e1f9eec790635ebffcc360a53bf1
This commit is contained in:
Colin Cross
2016-07-07 21:39:36 +00:00
committed by android-build-merger

View File

@@ -317,14 +317,14 @@ func (c *config) SanitizeHost() []string {
if c.ProductVariables.SanitizeHost == nil { if c.ProductVariables.SanitizeHost == nil {
return nil return nil
} }
return *c.ProductVariables.SanitizeHost return append([]string(nil), *c.ProductVariables.SanitizeHost...)
} }
func (c *config) SanitizeDevice() []string { func (c *config) SanitizeDevice() []string {
if c.ProductVariables.SanitizeDevice == nil { if c.ProductVariables.SanitizeDevice == nil {
return nil return nil
} }
return *c.ProductVariables.SanitizeDevice return append([]string(nil), *c.ProductVariables.SanitizeDevice...)
} }
func (c *config) Android64() bool { func (c *config) Android64() bool {