46 files changed, 59 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index ae93b9fe..5452aff4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,7 +56,61 @@ license {
     ],
 }
 
+license {
+    name: "winpthreads_license",
+    visibility: ["//build/soong"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["licenses/mingw-w64-svn-r5861/mingw-w64-libraries/winpthreads/COPYING"],
+}
+
 filegroup {
     name: "mingw-libwinpthread-notice",
     srcs: ["licenses/mingw-w64-svn-r5861/mingw-w64-libraries/winpthreads/COPYING"],
 }
+
+cc_prebuilt_library_shared {
+    name: "libwinpthread-1",
+    host_supported: true,
+    device_supported: false,
+    stl: "none",
+    licenses: ["winpthreads_license"],
+    multilib: {
+        lib32: {
+            srcs: ["x86_64-w64-mingw32/lib32/libwinpthread-1.dll"],
+        },
+        lib64: {
+            srcs: ["x86_64-w64-mingw32/bin/libwinpthread-1.dll"],
+        },
+    },
+    visibility: ["//development/build"],
+
+    enabled: false,
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
+}
+
+cc_prebuilt_library_static {
+    name: "libwinpthread",
+    host_supported: true,
+    enabled: false,
+    target: {
+        windows: {
+            enabled: true,
+        },
+        windows_x86: {
+            srcs: ["x86_64-w64-mingw32/lib32/libwinpthread.a"],
+        },
+        windows_x86_64: {
+            srcs: ["x86_64-w64-mingw32/lib/libwinpthread.a"],
+        },
+    },
+    stl: "none",
+    notice: ":mingw-libwinpthread-notice",
+    licenses: ["winpthreads_license"],
+}
diff --git a/METADATA b/METADATA
index 73adc802..582e5581 100644
--- a/METADATA
+++ b/METADATA
@@ -2,10 +2,10 @@
 #     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 #     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
-  # would be RESTRICTED save for GFDL in:
-  #   share/man/
-  #   share/info/
-  # and "no derivatives" restriction in:
-  #   share/man/man7/fsf-funding.7
+  license_note: "would be RESTRICTED save for GFDL in:\n"
+  "   share/man/\n"
+  "   share/info/\n"
+  " and save for "no derivatives" restriction in:\n"
+  "   share/man/man7/fsf-funding.7"
   license_type: BY_EXCEPTION_ONLY
 }
diff --git a/bin/x86_64-w64-mingw32-addr2line b/bin/x86_64-w64-mingw32-addr2line
deleted file mode 100755
index 5d3706e0..00000000
--- a/bin/x86_64-w64-mingw32-addr2line
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-ar b/bin/x86_64-w64-mingw32-ar
deleted file mode 100755
index 8571e382..00000000
--- a/bin/x86_64-w64-mingw32-ar
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-as b/bin/x86_64-w64-mingw32-as
deleted file mode 100755
index 30f2c63d..00000000
--- a/bin/x86_64-w64-mingw32-as
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-c++ b/bin/x86_64-w64-mingw32-c++
deleted file mode 100755
index 82e0e214..00000000
--- a/bin/x86_64-w64-mingw32-c++
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-c++filt b/bin/x86_64-w64-mingw32-c++filt
deleted file mode 100755
index f9f13ee6..00000000
--- a/bin/x86_64-w64-mingw32-c++filt
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-cpp b/bin/x86_64-w64-mingw32-cpp
deleted file mode 100755
index 01ae45d4..00000000
--- a/bin/x86_64-w64-mingw32-cpp
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-dlltool b/bin/x86_64-w64-mingw32-dlltool
deleted file mode 100755
index 36b6f16a..00000000
--- a/bin/x86_64-w64-mingw32-dlltool
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-dllwrap b/bin/x86_64-w64-mingw32-dllwrap
deleted file mode 100755
index 10a6d9c6..00000000
--- a/bin/x86_64-w64-mingw32-dllwrap
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-elfedit b/bin/x86_64-w64-mingw32-elfedit
deleted file mode 100755
index 3e546632..00000000
--- a/bin/x86_64-w64-mingw32-elfedit
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-g++ b/bin/x86_64-w64-mingw32-g++
deleted file mode 100755
index 82e0e214..00000000
--- a/bin/x86_64-w64-mingw32-g++
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-gcc b/bin/x86_64-w64-mingw32-gcc
deleted file mode 100755
index 9ec5fdd9..00000000
--- a/bin/x86_64-w64-mingw32-gcc
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-gcc-4.8.3 b/bin/x86_64-w64-mingw32-gcc-4.8.3
deleted file mode 100755
index 9ec5fdd9..00000000
--- a/bin/x86_64-w64-mingw32-gcc-4.8.3
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-gcc-ar b/bin/x86_64-w64-mingw32-gcc-ar
deleted file mode 100755
index 4a92d489..00000000
--- a/bin/x86_64-w64-mingw32-gcc-ar
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-gcc-nm b/bin/x86_64-w64-mingw32-gcc-nm
deleted file mode 100755
index 71e7ffa0..00000000
--- a/bin/x86_64-w64-mingw32-gcc-nm
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-gcc-ranlib b/bin/x86_64-w64-mingw32-gcc-ranlib
deleted file mode 100755
index 854efd43..00000000
--- a/bin/x86_64-w64-mingw32-gcc-ranlib
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-gcov b/bin/x86_64-w64-mingw32-gcov
deleted file mode 100755
index 2cb52a8c..00000000
--- a/bin/x86_64-w64-mingw32-gcov
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-gprof b/bin/x86_64-w64-mingw32-gprof
deleted file mode 100755
index 66d0c806..00000000
--- a/bin/x86_64-w64-mingw32-gprof
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-ld b/bin/x86_64-w64-mingw32-ld
deleted file mode 100755
index dae3ef35..00000000
--- a/bin/x86_64-w64-mingw32-ld
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-ld.bfd b/bin/x86_64-w64-mingw32-ld.bfd
deleted file mode 100755
index dae3ef35..00000000
--- a/bin/x86_64-w64-mingw32-ld.bfd
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-nm b/bin/x86_64-w64-mingw32-nm
deleted file mode 100755
index 4d8b2a30..00000000
--- a/bin/x86_64-w64-mingw32-nm
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-objcopy b/bin/x86_64-w64-mingw32-objcopy
deleted file mode 100755
index 904b9ec4..00000000
--- a/bin/x86_64-w64-mingw32-objcopy
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-objdump b/bin/x86_64-w64-mingw32-objdump
deleted file mode 100755
index 5d08add9..00000000
--- a/bin/x86_64-w64-mingw32-objdump
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-ranlib b/bin/x86_64-w64-mingw32-ranlib
deleted file mode 100755
index d0a91bc4..00000000
--- a/bin/x86_64-w64-mingw32-ranlib
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-readelf b/bin/x86_64-w64-mingw32-readelf
deleted file mode 100755
index 502a1bfa..00000000
--- a/bin/x86_64-w64-mingw32-readelf
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-size b/bin/x86_64-w64-mingw32-size
deleted file mode 100755
index 34ed74ed..00000000
--- a/bin/x86_64-w64-mingw32-size
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-strings b/bin/x86_64-w64-mingw32-strings
deleted file mode 100755
index ef513be3..00000000
--- a/bin/x86_64-w64-mingw32-strings
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-strip b/bin/x86_64-w64-mingw32-strip
deleted file mode 100755
index 39a737a9..00000000
--- a/bin/x86_64-w64-mingw32-strip
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-widl b/bin/x86_64-w64-mingw32-widl
deleted file mode 100755
index 5f9bb90b..00000000
--- a/bin/x86_64-w64-mingw32-widl
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-windmc b/bin/x86_64-w64-mingw32-windmc
deleted file mode 100755
index 97e214d5..00000000
--- a/bin/x86_64-w64-mingw32-windmc
+++ /dev/null
diff --git a/bin/x86_64-w64-mingw32-windres b/bin/x86_64-w64-mingw32-windres
deleted file mode 100755
index d49cb36a..00000000
--- a/bin/x86_64-w64-mingw32-windres
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/ar b/x86_64-w64-mingw32/bin/ar
deleted file mode 100755
index 8571e382..00000000
--- a/x86_64-w64-mingw32/bin/ar
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/as b/x86_64-w64-mingw32/bin/as
deleted file mode 100755
index 30f2c63d..00000000
--- a/x86_64-w64-mingw32/bin/as
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/c++ b/x86_64-w64-mingw32/bin/c++
deleted file mode 100755
index 82e0e214..00000000
--- a/x86_64-w64-mingw32/bin/c++
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/dlltool b/x86_64-w64-mingw32/bin/dlltool
deleted file mode 100755
index 36b6f16a..00000000
--- a/x86_64-w64-mingw32/bin/dlltool
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/g++ b/x86_64-w64-mingw32/bin/g++
deleted file mode 100755
index 82e0e214..00000000
--- a/x86_64-w64-mingw32/bin/g++
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/gcc b/x86_64-w64-mingw32/bin/gcc
deleted file mode 100755
index 9ec5fdd9..00000000
--- a/x86_64-w64-mingw32/bin/gcc
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/ld b/x86_64-w64-mingw32/bin/ld
deleted file mode 100755
index dae3ef35..00000000
--- a/x86_64-w64-mingw32/bin/ld
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/ld.bfd b/x86_64-w64-mingw32/bin/ld.bfd
deleted file mode 100755
index dae3ef35..00000000
--- a/x86_64-w64-mingw32/bin/ld.bfd
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/nm b/x86_64-w64-mingw32/bin/nm
deleted file mode 100755
index 4d8b2a30..00000000
--- a/x86_64-w64-mingw32/bin/nm
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/objcopy b/x86_64-w64-mingw32/bin/objcopy
deleted file mode 100755
index 904b9ec4..00000000
--- a/x86_64-w64-mingw32/bin/objcopy
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/objdump b/x86_64-w64-mingw32/bin/objdump
deleted file mode 100755
index 5d08add9..00000000
--- a/x86_64-w64-mingw32/bin/objdump
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/ranlib b/x86_64-w64-mingw32/bin/ranlib
deleted file mode 100755
index d0a91bc4..00000000
--- a/x86_64-w64-mingw32/bin/ranlib
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/readelf b/x86_64-w64-mingw32/bin/readelf
deleted file mode 100755
index 502a1bfa..00000000
--- a/x86_64-w64-mingw32/bin/readelf
+++ /dev/null
diff --git a/x86_64-w64-mingw32/bin/strip b/x86_64-w64-mingw32/bin/strip
deleted file mode 100755
index 39a737a9..00000000
--- a/x86_64-w64-mingw32/bin/strip
+++ /dev/null