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

Update gtest flags from Make am: 8146b2f1c9

Browse Source 
am: 4faa4d6aa9

* commit '4faa4d6aa9ea2b22590de26b6d4d7fc08e1d4cf4':
  Update gtest flags from Make

Change-Id: Ida3d4cff6717eaac2bfd36702533bdc6f4b8c733
This commit is contained in:
Dan Willemsen
2016-05-13 21:52:05 +00:00
committed by android-build-merger
parent c619c9cab9 4faa4d6aa9
commit 37fb4d0e7c
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cc/cc.go
View File

@@ -456,6 +456,7 @@ type ModuleContextIntf interface {
noDefaultCompilerFlags() bool
sdk() bool
sdkVersion() string
selectedStl() string
}
type ModuleContext interface {
@@ -637,6 +638,13 @@ func (ctx *moduleContextImpl) sdkVersion() string {
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 {
return &Module{
hod: hod,
@@ -2058,7 +2066,18 @@ func (test *testLinker) flags(ctx ModuleContext, flags Flags) Flags {
func (test *testLinker) deps(ctx BaseModuleContext, deps Deps) Deps {
if test.Properties.Gtest {
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest")
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 = test.binaryLinker.deps(ctx, deps)
return deps