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

Fix builds outside of make

Browse Source 
am: e15ddaf4ae

Change-Id: I2d313af3ec290d38b32361785b4a41d508e4aae4
This commit is contained in:
Colin Cross
2017-12-04 21:13:16 +00:00
committed by android-build-merger
parent ad843bce95 e15ddaf4ae
commit c9a8134399
1 changed files with 12 additions and 4 deletions
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
}
}