openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix path to gtest headers. 

Change-Id: Ieb64c4439125e95aecc4200ac6f9ea3375b347e7
This commit is contained in:
Tim Kilbourn 2015-03-19 10:02:21 -07:00
parent c403f7ce6d
commit 5ccc730672
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cc/cc.go
View File

@ -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)
}