Fix Android.mk LOCAL_EXPORT_C_INCLUDE_DIRS generation
We were keeping the original array, and adding duplicates with -I
removed. Instead, only add entries that start with -I, but continue
stripping that off. This removes the -isystem arguments from the NDK
libraries.
Change-Id: I8fd71bbd6b7a051aad7e80a92a05dbdc05a6b87a
diff --git a/cc/androidmk.go b/cc/androidmk.go
index 53c05d4..7ae960a 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -68,9 +68,9 @@
library.baseLinker.AndroidMk(ret)
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile common.Path) error {
- exportedIncludes := library.exportedFlags()
+ var exportedIncludes []string
for _, flag := range library.exportedFlags() {
- if flag != "" {
+ if strings.HasPrefix(flag, "-I") {
exportedIncludes = append(exportedIncludes, strings.TrimPrefix(flag, "-I"))
}
}