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

Android: run ./mach package implicitly after ./mach build by default

Browse source 
The result of `./mach build` for Android is a `.so` file
that cannot be used on its own, so running build without package
is presumably never useful.
This commit is contained in:
Simon Sapin 2018-07-16 11:51:10 +02:00
parent a6f403c5f2
commit 6ef56dac2b
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/ci/buildbot_steps.yml
View file

@ -164,7 +164,6 @@ android-x86:
- ./mach clean-cargo-cache --keep 3 --force - ./mach clean-cargo-cache --keep 3 --force
- ./etc/ci/bootstrap-android-and-accept-licences.sh - ./etc/ci/bootstrap-android-and-accept-licences.sh
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --target i686-linux-android --release - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --target i686-linux-android --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach package --target i686-linux-android --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-android-startup --release - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-android-startup --release
- bash ./etc/ci/lockfile_changed.sh - bash ./etc/ci/lockfile_changed.sh

10
python/servo/build_commands.py
View file

@ -23,6 +23,7 @@ from mach.decorators import (
CommandProvider, CommandProvider,
Command, Command,
) )
from mach.registrar import Registrar
from servo.command_base import CommandBase, cd, call, check_call, BIN_SUFFIX from servo.command_base import CommandBase, cd, call, check_call, BIN_SUFFIX
from servo.util import host_triple from servo.util import host_triple
@ -160,6 +161,9 @@ class MachCommands(CommandBase):
default=None, default=None,
action='store_true', action='store_true',
help='Build for Android') help='Build for Android')
@CommandArgument('--no-package',
action='store_true',
help='For Android, disable packaging into a .apk after building')
@CommandArgument('--debug-mozjs', @CommandArgument('--debug-mozjs',
default=None, default=None,
action='store_true', action='store_true',
@ -177,7 +181,7 @@ class MachCommands(CommandBase):
action='store_true', action='store_true',
help='Enable debug assertions in release') help='Enable debug assertions in release')
def build(self, target=None, release=False, dev=False, jobs=None, def build(self, target=None, release=False, dev=False, jobs=None,
features=None, android=None, verbose=False, very_verbose=False, features=None, android=None, no_package=False, verbose=False, very_verbose=False,
debug_mozjs=False, params=None, with_debug_assertions=False): debug_mozjs=False, params=None, with_debug_assertions=False):
opts = params or [] opts = params or []
@ -357,6 +361,10 @@ class MachCommands(CommandBase):
# Do some additional things if the build succeeded # Do some additional things if the build succeeded
if status == 0: if status == 0:
if android and not no_package:
Registrar.dispatch("package", context=self.context,
release=release, dev=dev, target=target)
if sys.platform == "win32": if sys.platform == "win32":
servo_exe_dir = path.join(base_path, "debug" if dev else "release") servo_exe_dir = path.join(base_path, "debug" if dev else "release")