tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix builds outside of make am: e15ddaf4ae am: c9a8134399

Browse source 
am: eae19f6269

Change-Id: I2225b6b414e5f125389583bb57f4cea5c2414070
This commit is contained in:
Colin Cross 2017-12-04 21:21:18 +00:00 committed by android-build-merger
commit 1266743566
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/config.go
View file

@ -475,19 +475,19 @@ func (c *config) PlatformVersionCombinedCodenames() []string {
} }
func (c *config) ProductAAPTConfig() []string { func (c *config) ProductAAPTConfig() []string {
return *c.ProductVariables.AAPTConfig return stringSlice(c.ProductVariables.AAPTConfig)
} }
func (c *config) ProductAAPTPreferredConfig() string { func (c *config) ProductAAPTPreferredConfig() string {
return *c.ProductVariables.AAPTPreferredConfig return String(c.ProductVariables.AAPTPreferredConfig)
} }
func (c *config) ProductAAPTCharacteristics() string { func (c *config) ProductAAPTCharacteristics() string {
return *c.ProductVariables.AAPTCharacteristics return String(c.ProductVariables.AAPTCharacteristics)
} }
func (c *config) ProductAAPTPrebuiltDPI() []string { func (c *config) ProductAAPTPrebuiltDPI() []string {
return *c.ProductVariables.AAPTPrebuiltDPI return stringSlice(c.ProductVariables.AAPTPrebuiltDPI)
} }
func (c *config) DefaultAppCertificateDir(ctx PathContext) SourcePath { func (c *config) DefaultAppCertificateDir(ctx PathContext) SourcePath {
@ -686,3 +686,11 @@ func (c *config) CFIEnabledForPath(path string) bool {
} }
return prefixInList(path, *c.ProductVariables.CFIIncludePaths) return prefixInList(path, *c.ProductVariables.CFIIncludePaths)
} }
func stringSlice(s *[]string) []string {
if s != nil {
return *s
} else {
return nil
}
}