StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cc: fix native tests

Browse Source 
Add libgtest to native test dependencies before adding stl
dependencies to resolve link errors between libgtest and
libc++_static.

Install device native tests to /dava/nativetest32 and
/data/nativetest64.

Change-Id: I6d9ddba8d5cdbacaa86cae0833fd7e656657e4d9
This commit is contained in:
Colin Cross
2015-04-28 13:26:49 -07:00
parent 2732e9a43f
commit a8a93d3769
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/cc.go
View File

@@ -1355,14 +1355,14 @@ func (c *CCTest) flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags {
} }
func (c *CCTest) depNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps { func (c *CCTest) depNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps {
depNames = c.CCBinary.depNames(ctx, depNames)
depNames.StaticLibs = append(depNames.StaticLibs, "libgtest", "libgtest_main") depNames.StaticLibs = append(depNames.StaticLibs, "libgtest", "libgtest_main")
depNames = c.CCBinary.depNames(ctx, depNames)
return depNames return depNames
} }
func (c *CCTest) installModule(ctx common.AndroidModuleContext, flags CCFlags) { func (c *CCTest) installModule(ctx common.AndroidModuleContext, flags CCFlags) {
if ctx.Device() { if ctx.Device() {
ctx.InstallFile("../data/nativetest/"+ctx.ModuleName(), c.out) ctx.InstallFile("../data/nativetest"+ctx.Arch().ArchType.Multilib[3:]+"/"+ctx.ModuleName(), c.out)
} else { } else {
c.CCBinary.installModule(ctx, flags) c.CCBinary.installModule(ctx, flags)
} }