diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-06 11:30:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 11:30:26 -0500 |
| commit | 8df38f5e29d0005b792d403c3c54d35748448100 (patch) | |
| tree | f13c673108b6a21b7ed25d39ab4310101df005b5 /support/android | |
| parent | 32d97d695e7aaf8fea9003dc1e4ef69e6f645ffb (diff) | |
| parent | 357f23fae1dff82eac983137b4e80f66d48bfa91 (diff) | |
| download | servo-8df38f5e29d0005b792d403c3c54d35748448100.tar.gz servo-8df38f5e29d0005b792d403c3c54d35748448100.zip | |
Auto merge of #22122 - Darkspirit:httpsdeps, r=jdm
Consistent servo-deps download URL
This PR ensures consistent https:// downloads for Servo dependencies.
It should be fine because
* https://servo-deps.s3.amazonaws.com is already used for MSVC deps:
https://github.com/servo/servo/blob/e217672c1ab665a68aca36bb5086956254604e75/python/servo/bootstrap.py#L286
* .travis.yml already downloads from [another https url](https://github.com/servo/servo/blob/e217672c1ab665a68aca36bb5086956254604e75/.travis.yml#L28) (https://sh.rustup.rs).
* In #22088 I saw the gstreamer dependency being download via https.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22122)
<!-- Reviewable:end -->
Diffstat (limited to 'support/android')
| -rw-r--r-- | support/android/openssl.makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/android/openssl.makefile b/support/android/openssl.makefile index 1e3ec330b64..90dee9eda8b 100644 --- a/support/android/openssl.makefile +++ b/support/android/openssl.makefile @@ -2,7 +2,7 @@ all: openssl @: # No-op to silence the "make: Nothing to be done for 'all'." message. -# From http://wiki.openssl.org/index.php/Android +# From https://wiki.openssl.org/index.php/Android .PHONY: openssl openssl: openssl-${OPENSSL_VERSION}/libssl.so @@ -10,5 +10,5 @@ openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure ./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION} openssl-${OPENSSL_VERSION}/Configure: - URL=https://s3.amazonaws.com/servo-deps/android-deps/openssl-${OPENSSL_VERSION}.tar.gz; \ + URL=https://servo-deps.s3.amazonaws.com/android-deps/openssl-${OPENSSL_VERSION}.tar.gz; \ curl $$URL | tar xzf - |