diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-04 06:18:28 -0700 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-04 06:18:28 -0700 |
| commit | 7a439e62371189a986f3339b80b70e76642dc060 (patch) | |
| tree | 32b8df59cfbe6622fd79e76f9666974e1858d4da /python | |
| parent | 29823cb378ad0b05a82cfdd133c401a678a19007 (diff) | |
| parent | e1386cad6fdfd0776f65da6a0ff7a0a8563df667 (diff) | |
| download | servo-7a439e62371189a986f3339b80b70e76642dc060.tar.gz servo-7a439e62371189a986f3339b80b70e76642dc060.zip | |
Auto merge of #10997 - mbrubeck:openssl-1.0.1t, r=aneeshusa
Upgrade to OpenSSL 1.0.1t on Android
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10997)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/build_commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 31d8d1ded39..d5f29fea854 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -222,7 +222,7 @@ class MachCommands(CommandBase): verbose=verbose) if status: return status - openssl_dir = path.join(openssl_dir, "openssl-1.0.1k") + openssl_dir = path.join(openssl_dir, "openssl-1.0.1t") env['OPENSSL_LIB_DIR'] = openssl_dir env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") env['OPENSSL_STATIC'] = 'TRUE' |