From 737cb6566f0483dce12324a5bc0d254bfe15a1f4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 25 Apr 2016 15:12:15 -0700 Subject: [PATCH] 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 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cc/cc.go b/cc/cc.go index 851e4c3e7..d46505f1f 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -1997,10 +1997,6 @@ func (test *testLinker) flags(ctx ModuleContext, flags Flags) Flags { 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 }