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

Don\'t use GTEST_OS_LINUX on Darwin am: 4a94683a60 am: 390657eb77

Browse Source 
am: bd771fc737

* commit 'bd771fc7370ac710e3d1887521a92d81dfc4f74c':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: I0f2500cc32fb5e8e043bb502a7d5b77cee9f2400
This commit is contained in:
Dan Willemsen
2016-05-13 22:44:16 +00:00
committed by android-build-merger
parent e52f688242 bd771fc737
commit 3da3479fa0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/cc.go
View File

@@ -2051,11 +2051,15 @@ func (test *testLinker) flags(ctx ModuleContext, flags Flags) Flags {
if ctx.Host() {
flags.CFlags = append(flags.CFlags, "-O0", "-g")
if ctx.HostType() == common.Windows {
switch ctx.HostType() {
case common.Windows:
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_WINDOWS")
} else {
case common.Linux:
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_LINUX")
flags.LdFlags = append(flags.LdFlags, "-lpthread")
case common.Darwin:
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_MAC")
flags.LdFlags = append(flags.LdFlags, "-lpthread")
}
} else {
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_LINUX_ANDROID")