Snap for 8730993 from 93f0ab404f78e44a6ea79a1eabbc45537259f7e4 to mainline-tzdata3-release

Change-Id: I362e99f7bfb40506e770bf7bb80b4a091c38c787
diff --git a/Android.bp b/Android.bp
index 5452aff..ae93b9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,61 +56,7 @@
     ],
 }
 
-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 582e558..73adc80 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 {
-  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"
+  # would be RESTRICTED save for GFDL in:
+  #   share/man/
+  #   share/info/
+  # and "no derivatives" restriction in:
+  #   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
new file mode 100755
index 0000000..5d3706e
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-addr2line
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-ar b/bin/x86_64-w64-mingw32-ar
new file mode 100755
index 0000000..8571e38
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-ar
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-as b/bin/x86_64-w64-mingw32-as
new file mode 100755
index 0000000..30f2c63
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-as
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-c++ b/bin/x86_64-w64-mingw32-c++
new file mode 100755
index 0000000..82e0e21
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-c++
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-c++filt b/bin/x86_64-w64-mingw32-c++filt
new file mode 100755
index 0000000..f9f13ee
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-c++filt
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-cpp b/bin/x86_64-w64-mingw32-cpp
new file mode 100755
index 0000000..01ae45d
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-cpp
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-dlltool b/bin/x86_64-w64-mingw32-dlltool
new file mode 100755
index 0000000..36b6f16
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-dlltool
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-dllwrap b/bin/x86_64-w64-mingw32-dllwrap
new file mode 100755
index 0000000..10a6d9c
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-dllwrap
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-elfedit b/bin/x86_64-w64-mingw32-elfedit
new file mode 100755
index 0000000..3e54663
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-elfedit
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-g++ b/bin/x86_64-w64-mingw32-g++
new file mode 100755
index 0000000..82e0e21
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-g++
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-gcc b/bin/x86_64-w64-mingw32-gcc
new file mode 100755
index 0000000..9ec5fdd
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-gcc
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-gcc-4.8.3 b/bin/x86_64-w64-mingw32-gcc-4.8.3
new file mode 100755
index 0000000..9ec5fdd
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-gcc-4.8.3
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-gcc-ar b/bin/x86_64-w64-mingw32-gcc-ar
new file mode 100755
index 0000000..4a92d48
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-gcc-ar
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-gcc-nm b/bin/x86_64-w64-mingw32-gcc-nm
new file mode 100755
index 0000000..71e7ffa
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-gcc-nm
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-gcc-ranlib b/bin/x86_64-w64-mingw32-gcc-ranlib
new file mode 100755
index 0000000..854efd4
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-gcc-ranlib
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-gcov b/bin/x86_64-w64-mingw32-gcov
new file mode 100755
index 0000000..2cb52a8
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-gcov
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-gprof b/bin/x86_64-w64-mingw32-gprof
new file mode 100755
index 0000000..66d0c80
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-gprof
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-ld b/bin/x86_64-w64-mingw32-ld
new file mode 100755
index 0000000..dae3ef3
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-ld
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-ld.bfd b/bin/x86_64-w64-mingw32-ld.bfd
new file mode 100755
index 0000000..dae3ef3
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-ld.bfd
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-nm b/bin/x86_64-w64-mingw32-nm
new file mode 100755
index 0000000..4d8b2a3
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-nm
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-objcopy b/bin/x86_64-w64-mingw32-objcopy
new file mode 100755
index 0000000..904b9ec
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-objcopy
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-objdump b/bin/x86_64-w64-mingw32-objdump
new file mode 100755
index 0000000..5d08add
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-objdump
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-ranlib b/bin/x86_64-w64-mingw32-ranlib
new file mode 100755
index 0000000..d0a91bc
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-ranlib
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-readelf b/bin/x86_64-w64-mingw32-readelf
new file mode 100755
index 0000000..502a1bf
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-readelf
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-size b/bin/x86_64-w64-mingw32-size
new file mode 100755
index 0000000..34ed74e
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-size
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-strings b/bin/x86_64-w64-mingw32-strings
new file mode 100755
index 0000000..ef513be
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-strings
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-strip b/bin/x86_64-w64-mingw32-strip
new file mode 100755
index 0000000..39a737a
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-strip
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-widl b/bin/x86_64-w64-mingw32-widl
new file mode 100755
index 0000000..5f9bb90
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-widl
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-windmc b/bin/x86_64-w64-mingw32-windmc
new file mode 100755
index 0000000..97e214d
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-windmc
Binary files differ
diff --git a/bin/x86_64-w64-mingw32-windres b/bin/x86_64-w64-mingw32-windres
new file mode 100755
index 0000000..d49cb36
--- /dev/null
+++ b/bin/x86_64-w64-mingw32-windres
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/ar b/x86_64-w64-mingw32/bin/ar
new file mode 100755
index 0000000..8571e38
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/ar
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/as b/x86_64-w64-mingw32/bin/as
new file mode 100755
index 0000000..30f2c63
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/as
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/c++ b/x86_64-w64-mingw32/bin/c++
new file mode 100755
index 0000000..82e0e21
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/c++
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/dlltool b/x86_64-w64-mingw32/bin/dlltool
new file mode 100755
index 0000000..36b6f16
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/dlltool
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/g++ b/x86_64-w64-mingw32/bin/g++
new file mode 100755
index 0000000..82e0e21
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/g++
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/gcc b/x86_64-w64-mingw32/bin/gcc
new file mode 100755
index 0000000..9ec5fdd
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/gcc
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/ld b/x86_64-w64-mingw32/bin/ld
new file mode 100755
index 0000000..dae3ef3
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/ld
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/ld.bfd b/x86_64-w64-mingw32/bin/ld.bfd
new file mode 100755
index 0000000..dae3ef3
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/ld.bfd
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/nm b/x86_64-w64-mingw32/bin/nm
new file mode 100755
index 0000000..4d8b2a3
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/nm
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/objcopy b/x86_64-w64-mingw32/bin/objcopy
new file mode 100755
index 0000000..904b9ec
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/objcopy
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/objdump b/x86_64-w64-mingw32/bin/objdump
new file mode 100755
index 0000000..5d08add
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/objdump
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/ranlib b/x86_64-w64-mingw32/bin/ranlib
new file mode 100755
index 0000000..d0a91bc
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/ranlib
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/readelf b/x86_64-w64-mingw32/bin/readelf
new file mode 100755
index 0000000..502a1bf
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/readelf
Binary files differ
diff --git a/x86_64-w64-mingw32/bin/strip b/x86_64-w64-mingw32/bin/strip
new file mode 100755
index 0000000..39a737a
--- /dev/null
+++ b/x86_64-w64-mingw32/bin/strip
Binary files differ