diff options
| -rw-r--r-- | python/servo/command_base.py | 5 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index c813242f85d..b335dcd69eb 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -488,8 +488,9 @@ class CommandBase(object): # Some systems don't have pkg-config; we can't probe in this case # and must hope for the best return False - if "x86_64" not in (target or host_triple()): - # We don't build gstreamer for non-x86_64 yet + effective_target = target or host_triple() + if "x86_64" not in effective_target or "android" in effective_target: + # We don't build gstreamer for non-x86_64 / android yet return False if sys.platform == "linux2": if path.isdir(self.get_gstreamer_path()): diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index dc2d10daf3d..1e91032dea6 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -184,7 +184,6 @@ class PackageCommands(CommandBase): default=None, help='Package using the given Gradle flavor') def package(self, release=False, dev=False, android=None, debug=False, debugger=None, target=None, flavor=None): - env = self.build_env(target=target) if android is None: android = self.config["build"]["android"] if target and android: @@ -192,6 +191,9 @@ class PackageCommands(CommandBase): sys.exit(1) if not android: android = self.handle_android_target(target) + else: + target = self.config["android"]["target"] + env = self.build_env(target=target) binary_path = self.get_binary_path(release, dev, android=android) dir_to_root = self.get_top_dir() target_dir = path.dirname(binary_path) |