Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 06:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make armv7-linux-androideabi default target on Android

Browse source
This commit is contained in:
Imanol Fernandez 2017-05-23 10:26:37 +02:00
parent 1b9cc2de34
commit 04fb628d20
4 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/command_base.py
View file

@ -277,7 +277,8 @@ class CommandBase(object):
self.config["android"].setdefault("sdk", "")
self.config["android"].setdefault("ndk", "")
self.config["android"].setdefault("toolchain", "")
self.handle_android_target("arm-linux-androideabi")
# Set default android target
self.handle_android_target("armv7-linux-androideabi")
self.set_cargo_root()
self.set_use_stable_rust(False)

20
python/servo/package_commands.py
View file

@ -175,10 +175,18 @@ class PackageCommands(CommandBase):
default=None,
action='store_true',
help='Package Android')
def package(self, release=False, dev=False, android=None, debug=False, debugger=None):
@CommandArgument('--target', '-t',
default=None,
help='Package for given target platform')
def package(self, release=False, dev=False, android=None, debug=False, debugger=None, target=None):
env = self.build_env()
if android is None:
android = self.config["build"]["android"]
if target and android:
print("Please specify either --target or --android.")
sys.exit(1)
if not android:
android = self.handle_android_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)
@ -384,7 +392,15 @@ class PackageCommands(CommandBase):
@CommandArgument('--android',
action='store_true',
help='Install on Android')
def install(self, release=False, dev=False, android=False):
@CommandArgument('--target', '-t',
default=None,
help='Install the given target platform')
def install(self, release=False, dev=False, android=False, target=None):
if target and android:
print("Please specify either --target or --android.")
sys.exit(1)
if not android:
android = self.handle_android_target(target)
try:
binary_path = self.get_binary_path(release, dev, android=android)
except BuildNotFound: