Fix path to gtest headers.
Change-Id: Ieb64c4439125e95aecc4200ac6f9ea3375b347e7
diff --git a/cc/cc.go b/cc/cc.go
index a9ed205..8abfae7 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1155,7 +1155,8 @@
}
// 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) 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)
}