diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2014-09-29 14:22:02 -0700 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2014-10-10 11:36:12 -0700 |
| commit | 77d32ee4470981af2074e164cf47fc7a909b1ed1 (patch) | |
| tree | 72d56a7c4f95b61be955415e072383401164097c /python/servo/build_commands.py | |
| parent | bfb81a5d103bb3e88830c9a553e1d0d3d1d402c0 (diff) | |
| download | servo-77d32ee4470981af2074e164cf47fc7a909b1ed1.tar.gz servo-77d32ee4470981af2074e164cf47fc7a909b1ed1.zip | |
Move windowing code out of the compositor
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 2d67fdb8c75..5a7316a9b97 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -46,20 +46,22 @@ class MachCommands(CommandBase): opts += ["--release"] if target: opts += ["--target", target] - elif android: - opts += ["--target", "arm-linux-androideabi"] if jobs is not None: opts += ["-j", jobs] if verbose: opts += ["-v"] build_start = time() - status = subprocess.call( - ["cargo", "build"] + opts, - env=self.build_env()) if android: - status = status or subprocess.call( - ["make", "-C", "ports/android"], + make_opts = [] + if opts: + make_opts += ["CARGO_OPTS=" + " ".join(opts)] + status = subprocess.call( + ["make", "-C", "ports/android"] + make_opts, + env=self.build_env()) + else: + status = subprocess.call( + ["cargo", "build"] + opts, env=self.build_env()) elapsed = time() - build_start |