Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-02 21:13:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

mach package should work on android

Browse source
This commit is contained in:
Manish Goregaokar 2018-09-11 22:14:31 +05:30
parent 5d6701179c
commit 2cc4e1dcdc
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/servo/command_base.py
View file

@ -488,8 +488,9 @@ class CommandBase(object):
# Some systems don't have pkg-config; we can't probe in this case # Some systems don't have pkg-config; we can't probe in this case
# and must hope for the best # and must hope for the best
return False return False
if "x86_64" not in (target or host_triple()): effective_target = target or host_triple()
# We don't build gstreamer for non-x86_64 yet 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 return False
if sys.platform == "linux2": if sys.platform == "linux2":
if path.isdir(self.get_gstreamer_path()): if path.isdir(self.get_gstreamer_path()):

4
python/servo/package_commands.py
View file

@ -184,7 +184,6 @@ class PackageCommands(CommandBase):
default=None, default=None,
help='Package using the given Gradle flavor') help='Package using the given Gradle flavor')
def package(self, release=False, dev=False, android=None, debug=False, debugger=None, target=None, flavor=None): 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: if android is None:
android = self.config["build"]["android"] android = self.config["build"]["android"]
if target and android: if target and android:
@ -192,6 +191,9 @@ class PackageCommands(CommandBase):
sys.exit(1) sys.exit(1)
if not android: if not android:
android = self.handle_android_target(target) 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) binary_path = self.get_binary_path(release, dev, android=android)
dir_to_root = self.get_top_dir() dir_to_root = self.get_top_dir()
target_dir = path.dirname(binary_path) target_dir = path.dirname(binary_path)