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

auto merge of #4816 : mskrzypkows/servo/mskrzypkows_b, r=jdm

Browse source 
Sorry again the same pull request because I accidentally removed commit from branch.
This commit is contained in:
bors-servo 2015-02-03 07:09:52 -07:00
commit 3da41c2b16
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/servo/build_commands.py
View file

@ -86,9 +86,12 @@ class MachCommands(CommandBase):
env = self.build_env()
if android:
# Build OpenSSL for android
make_cmd = ["make"]
if jobs is not None:
make_cmd += ["-j" + jobs]
with cd(self.android_support_dir()):
status = subprocess.call(
["make", "-j4", "-f", "openssl.makefile"],
make_cmd + ["-f", "openssl.makefile"],
env=self.build_env())
env['OPENSSL_PATH'] = path.join(self.android_support_dir(), "openssl-1.0.1k")