servo: Merge #17240 - #17079 : Changed the openssl url and bumped the version (from o0Ignition0o:openssl_from_mirror); r=jdm

<!-- Please describe your changes on the following line: -->
Changed the openssl url and bumped the version.
It's a wip because I haven't figured out a relevant way to write a test about it yet.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #17079 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because The mach command will fail if anything goes wrong.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: d7dff8e6d118bf82f837b3e6387cf96647007cdd

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 055342649187141e17718b9b012d5efb13adc231

servo/python/servo/build_commands.py

@@ -247,6 +247,7 @@ class MachCommands(CommandBase):
 
         if android:
             # Build OpenSSL for android
+            env["OPENSSL_VERSION"] = "1.0.2k"
             make_cmd = ["make"]
             if jobs is not None:
                 make_cmd += ["-j" + jobs]
@@ -264,7 +265,7 @@ class MachCommands(CommandBase):
                     verbose=verbose)
                 if status:
                     return status
-            openssl_dir = path.join(openssl_dir, "openssl-1.0.1t")
+            openssl_dir = path.join(openssl_dir, "openssl-{}".format(env["OPENSSL_VERSION"]))
             env['OPENSSL_LIB_DIR'] = openssl_dir
             env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")
             env['OPENSSL_STATIC'] = 'TRUE'

servo/support/android/openssl.makefile

@@ -4,11 +4,11 @@ all: openssl
 
 # From http://wiki.openssl.org/index.php/Android
 .PHONY: openssl
-openssl: openssl-1.0.1t/libssl.so
+openssl: openssl-${OPENSSL_VERSION}/libssl.so
 
-openssl-1.0.1t/libssl.so: openssl-1.0.1t/Configure
-	./openssl.sh ${ANDROID_NDK}
+openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure
+	./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION}
 
-openssl-1.0.1t/Configure:
-	wget https://www.openssl.org/source/old/1.0.1/openssl-1.0.1t.tar.gz
-	tar -zxf openssl-1.0.1t.tar.gz
+openssl-${OPENSSL_VERSION}/Configure:
+	URL=https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/openssl-${OPENSSL_VERSION}.tar.gz; \
+	curl $$URL | tar xzf -

servo/support/android/openssl.sh

@@ -181,7 +181,7 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then
   echo "ANDROID_DEV: $ANDROID_DEV"
 fi
 
-cd openssl-1.0.1t
+cd openssl-$2
 perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
 
 # The code being built isn't maintained by us, so we redirect stderr to stdout