Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use mach to build openssl on android instead of glut makefile.

Browse source 
The glut makefile will be removed shortly after glutin lands
for android, so we need to build openssl for android elsewhere
in the build process.
This commit is contained in:
Glenn Watson 2014-12-08 13:40:23 +10:00
parent feabaf34ac
commit 030dab553e
6 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
python/servo/build_commands.py
View file

@ -63,17 +63,25 @@ class MachCommands(CommandBase):
opts += ["--features", "%s" % ' '.join(features)]
build_start = time()
env = self.build_env()
if android:
# Build OpenSSL for android
with cd(self.android_support_dir()):
status = subprocess.call(
["make", "-j4", "-f", "openssl.makefile"],
env=self.build_env())
env['OPENSSL_PATH'] = path.join(self.android_support_dir(), "openssl-1.0.1j")
make_opts = []
if opts:
make_opts += ["CARGO_OPTS=" + " ".join(opts)]
status = subprocess.call(
["make", "-C", "ports/android"] + make_opts,
env=self.build_env())
env=env)
else:
status = subprocess.call(
["cargo", "build"] + opts,
env=self.build_env(), cwd=self.servo_crate())
env=env, cwd=self.servo_crate())
elapsed = time() - build_start
print("Build completed in %0.2fs" % elapsed)