Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch Android to OpenSSL 1.1.1d

Browse source
This commit is contained in:
Jan Andre Ikenmeyer 2020-02-12 02:01:13 +01:00
parent 21112a1b84
commit ad9ee36e7b
No known key found for this signature in database
GPG key ID: 28F9E42748DD95AE
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/ci/check_dynamic_symbols.py
View file

@ -32,6 +32,7 @@ allowed_symbols = frozenset([
b'sigemptyset', b'sigemptyset',
b'AHardwareBuffer_allocate', b'AHardwareBuffer_allocate',
b'AHardwareBuffer_release', b'AHardwareBuffer_release',
b'getentropy',
]) ])
actual_symbols = set() actual_symbols = set()

4
python/servo/build_commands.py
View file

@ -331,7 +331,7 @@ class MachCommands(CommandBase):
android_arch = self.config["android"]["arch"] android_arch = self.config["android"]["arch"]
# Build OpenSSL for android # Build OpenSSL for android
env["OPENSSL_VERSION"] = "1.0.2k" env["OPENSSL_VERSION"] = "1.1.1d"
make_cmd = ["make"] make_cmd = ["make"]
if jobs is not None: if jobs is not None:
make_cmd += ["-j" + jobs] make_cmd += ["-j" + jobs]
@ -580,7 +580,7 @@ class MachCommands(CommandBase):
# The Open SSL configuration # The Open SSL configuration
env.setdefault("OPENSSL_DIR", path.join(target_path, target, "native", "openssl")) env.setdefault("OPENSSL_DIR", path.join(target_path, target, "native", "openssl"))
env.setdefault("OPENSSL_VERSION", "1.0.2k") env.setdefault("OPENSSL_VERSION", "1.1.1d")
env.setdefault("OPENSSL_STATIC", "1") env.setdefault("OPENSSL_STATIC", "1")
# GStreamer configuration # GStreamer configuration