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

Update gtest flags from Make

Browse Source 
There's a different libgtest to use for NDK libraries built with
different STLs. And we no longer need to add the gtest include path, as
it's exported.

Change-Id: I2f804cf98e074cfd4ea6b70a445e304a8a8bce50
This commit is contained in:
Dan Willemsen
2016-03-30 21:00:30 -07:00
parent 2630213418
commit 8146b2f1c9
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cc/cc.go
View File

@@ -456,6 +456,7 @@ type ModuleContextIntf interface {
noDefaultCompilerFlags() bool noDefaultCompilerFlags() bool
sdk() bool sdk() bool
sdkVersion() string sdkVersion() string
selectedStl() string
} }
type ModuleContext interface { type ModuleContext interface {
@@ -637,6 +638,13 @@ func (ctx *moduleContextImpl) sdkVersion() string {
return ctx.mod.Properties.Sdk_version return ctx.mod.Properties.Sdk_version
} }
func (ctx *moduleContextImpl) selectedStl() string {
if stl := ctx.mod.stl; stl != nil {
return stl.Properties.SelectedStl
}
return ""
}
func newBaseModule(hod common.HostOrDeviceSupported, multilib common.Multilib) *Module { func newBaseModule(hod common.HostOrDeviceSupported, multilib common.Multilib) *Module {
return &Module{ return &Module{
hod: hod, hod: hod,
@@ -2058,8 +2066,19 @@ func (test *testLinker) flags(ctx ModuleContext, flags Flags) Flags {
func (test *testLinker) deps(ctx BaseModuleContext, deps Deps) Deps { func (test *testLinker) deps(ctx BaseModuleContext, deps Deps) Deps {
if test.Properties.Gtest { if test.Properties.Gtest {
if ctx.sdk() && ctx.Device() {
switch ctx.selectedStl() {
case "ndk_libc++_shared", "ndk_libc++_static":
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_libcxx", "libgtest_ndk_libcxx")
case "ndk_libgnustl_static":
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_gnustl", "libgtest_ndk_gnustl")
default:
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk", "libgtest_ndk")
}
} else {
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest") deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest")
} }
}
deps = test.binaryLinker.deps(ctx, deps) deps = test.binaryLinker.deps(ctx, deps)
return deps return deps
} }