From 3b1fffa33b34e0efb17b46e7461609f4665285ed Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 5 May 2016 15:11:48 -0700 Subject: [PATCH] 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 --- cc/androidmk.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index 53c05d4d5..7ae960a75 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -68,9 +68,9 @@ func (library *libraryLinker) AndroidMk(ret *common.AndroidMkData) { 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")) } }