From 5ccc7306725ade6b4f6b0d1aa2541d173e969c0f Mon Sep 17 00:00:00 2001 From: Tim Kilbourn Date: Thu, 19 Mar 2015 10:02:21 -0700 Subject: [PATCH] Fix path to gtest headers. Change-Id: Ieb64c4439125e95aecc4200ac6f9ea3375b347e7 --- cc/cc.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cc/cc.go b/cc/cc.go index a9ed2051a..8abfae7da 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -1155,7 +1155,8 @@ func (c *ccTest) collectDeps(ctx common.AndroidModuleContext, flags ccFlags) (cc } // TODO(danalbert): Make gtest export its dependencies. - flags.includeDirs = append(flags.includeDirs, "external/gtest/include") + flags.includeDirs = append(flags.includeDirs, + filepath.Join(ctx.Config().(Config).SrcDir(), "external/gtest/include")) _, staticLibs, _ := c.collectDepsFromList(ctx, gtestLibs) deps.staticLibs = append(deps.staticLibs, staticLibs...) @@ -1171,7 +1172,7 @@ func (c *ccTest) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerMod func (c *ccTest) installModule(ctx common.AndroidModuleContext, flags ccFlags) { if c.HostOrDevice().Device() { - ctx.InstallFile("../data/nativetest/" + ctx.ModuleName(), c.out) + ctx.InstallFile("../data/nativetest/"+ctx.ModuleName(), c.out) } else { c.ccBinary.installModule(ctx, flags) }