Merge "Use not_windows instead of linux/darwin"
am: dc848d2080
Change-Id: I6de0caba1c6cbccd4a706397705d613529c92d5b
diff --git a/soong/llvm.go b/soong/llvm.go
index 7ff99bd..bc48f2a 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -57,10 +57,7 @@
Host struct {
Enabled *bool
}
- Linux struct {
- Cflags []string
- }
- Darwin struct {
+ Not_windows struct {
Cflags []string
}
}
@@ -70,9 +67,8 @@
p := &props{}
p.Cflags = globalFlags(ctx)
p.Target.Android.Cflags = deviceFlags(ctx)
- h := hostFlags(ctx)
- p.Target.Linux.Cflags = h
- p.Target.Darwin.Cflags = h
+ // Mingw fails to link binaries with lots of debug information
+ p.Target.Not_windows.Cflags = hostFlags(ctx)
if ctx.AConfig().IsEnvTrue("DISABLE_LLVM_DEVICE_BUILDS") {
p.Target.Android.Enabled = proptools.BoolPtr(false)