Fix builds outside of make
Builds outside of make use custom config files that may not set
some variables, which is causing nil pointer derefernces. Use
wrapper functions that check for nil for the new config
variables.
Test: build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I0f837094532aeb2ecdbe401affa55a7535075bf6
diff --git a/android/config.go b/android/config.go
index 8ae6471..a4624c7 100644
--- a/android/config.go
+++ b/android/config.go
@@ -475,19 +475,19 @@
}
func (c *config) ProductAAPTConfig() []string {
- return *c.ProductVariables.AAPTConfig
+ return stringSlice(c.ProductVariables.AAPTConfig)
}
func (c *config) ProductAAPTPreferredConfig() string {
- return *c.ProductVariables.AAPTPreferredConfig
+ return String(c.ProductVariables.AAPTPreferredConfig)
}
func (c *config) ProductAAPTCharacteristics() string {
- return *c.ProductVariables.AAPTCharacteristics
+ return String(c.ProductVariables.AAPTCharacteristics)
}
func (c *config) ProductAAPTPrebuiltDPI() []string {
- return *c.ProductVariables.AAPTPrebuiltDPI
+ return stringSlice(c.ProductVariables.AAPTPrebuiltDPI)
}
func (c *config) DefaultAppCertificateDir(ctx PathContext) SourcePath {
@@ -686,3 +686,11 @@
}
return prefixInList(path, *c.ProductVariables.CFIIncludePaths)
}
+
+func stringSlice(s *[]string) []string {
+ if s != nil {
+ return *s
+ } else {
+ return nil
+ }
+}