commit 737cb6566f0483dce12324a5bc0d254bfe15a1f4
author Colin Cross <ccross@android.com> Mon Apr 25 15:12:15 2016 -0700
committer Colin Cross <ccross@android.com> Mon Apr 25 15:13:23 2016 -0700
tree 988a5f6f6e96ee2a881edb446f59a15719650d82
parent 16b234919080732f438598adc3a3ca5fe2456b88

Use exported gtest include directories

Manually inserting gtest include directories causes build failures in
manifests that don't have external/gtest.  external/gtest already
exports its include directories so remove the manual include directory.

Change-Id: I6baac4bd3bea7dba3aa134d18b66f02a6dc9a54a

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 851e4c3..d46505f 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1997,10 +1997,6 @@
 		flags.CFlags = append(flags.CFlags, "-DGTEST_OS_LINUX_ANDROID")
 	}
 
-	// TODO(danalbert): Make gtest export its dependencies.
-	flags.CFlags = append(flags.CFlags,
-		"-I"+common.PathForSource(ctx, "external/gtest/include").String())
-
 	return flags
 }