commit 4c46af8943e81bab2e8de92d8e9b5a0e7e8d79ea
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 24 23:20:21 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 24 23:20:23 2017 +0000
tree 4f732fd321fd3b6b625056847d9a81686f76c242
parent 664806a843a71ff2acc676aff15e4e5e51323f42
parent c38d366d787511506c227b63d873d643a150e3da

Merge "Updates for the new ckati drop"

Android.bp

diff --git a/Android.bp b/Android.bp
index 74da7c1..c6b6ee4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -246,6 +246,17 @@
 }
 
 toolchain_library {
+    name: "libwinpthread",
+    host_supported: true,
+    enabled: false,
+    target: {
+        windows: {
+            enabled: true
+        },
+    },
+}
+
+toolchain_library {
     name: "libgcov",
     defaults: ["linux_bionic_supported"],
     arch: {

cc/linker.go

diff --git a/cc/linker.go b/cc/linker.go
index 4619926..07d9aa8 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -156,6 +156,10 @@
 		}
 	}
 
+	if ctx.Os() == android.Windows {
+		deps.LateStaticLibs = append(deps.LateStaticLibs, "libwinpthread")
+	}
+
 	return deps
 }