Merge "Add libwinpthread, link it into win32 binaries."

2017-02-24 21:02:23 +00:00
parent 9383f82428 7bd4c5c339
commit 664806a843
2 changed files with 15 additions and 0 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -245,6 +245,17 @@ toolchain_library {
    },
 }

+toolchain_library {
+    name: "libwinpthread",
+    host_supported: true,
+    enabled: false,
+    target: {
+        windows: {
+            enabled: true
+        },
+    },
+}
+
 toolchain_library {
    name: "libgcov",
    defaults: ["linux_bionic_supported"],
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -156,6 +156,10 @@ func (linker *baseLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
 		}
 	}

+	if ctx.Os() == android.Windows {
+		deps.LateStaticLibs = append(deps.LateStaticLibs, "libwinpthread")
+	}
+
 	return deps
 }