Update to UWP compatible OpenSSL build.

python/servo/build_commands.py

@@ -234,7 +234,7 @@ def build(self, release=False, dev=False, jobs=None, params=None,
                 check_call(["rustup" + BIN_SUFFIX, "target", "add",
                             "--toolchain", self.toolchain(), target])
 
-        env = self.build_env(target=target, is_build=True)
+        env = self.build_env(target=target, is_build=True, uwp=uwp)
         self.ensure_bootstrapped(target=target)
         self.ensure_clobbered()
 

python/servo/command_base.py

@@ -614,7 +614,7 @@ def vs_dirs(self):
             'vcdir': vcinstalldir,
         }
 
-    def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False):
+    def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False, uwp=False):
         """Return an extended environment dictionary."""
         env = os.environ.copy()
         if sys.platform == "win32" and type(env['PATH']) == unicode:
@@ -639,6 +639,9 @@ def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit
                 "i686": "x86-windows",
                 "aarch64": "arm64-windows",
             }
+            target_arch = vcpkg_arch[arch]
+            if uwp:
+                target_arch += "-uwp"
             openssl_base_dir = path.join(self.msvc_package_dir("openssl"), vcpkg_arch[arch])
 
             # Link openssl

python/servo/packages.py

@@ -8,7 +8,7 @@
     "moztools": "3.2",
     "ninja": "1.7.1",
     "nuget": "08-08-2019",
-    "openssl": "111.3.0+1.1.1c-vs2017",
+    "openssl": "111.3.0+1.1.1c-vs2017-2019-09-18",
     "gstreamer-uwp": "1.16.0.5",
     "openxr-loader-uwp": "1.0",
 }