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

Implement Gradle flavors

Browse source
This commit is contained in:
Imanol Fernandez 2017-09-29 23:19:33 +02:00
parent ffa03380ca
commit e93130026a
13 changed files with 132 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/servo/build_commands.py
View file

@ -309,6 +309,11 @@ class MachCommands(CommandBase):
env['CPPFLAGS'] = ' '.join(["--sysroot", env['ANDROID_SYSROOT']])
env["CMAKE_ANDROID_ARCH_ABI"] = self.config["android"]["lib"]
env["CMAKE_TOOLCHAIN_FILE"] = path.join(self.android_support_dir(), "toolchain.cmake")
# Set output dir for gradle aar files
aar_out_dir = self.android_aar_dir()
if not os.path.exists(aar_out_dir):
os.makedirs(aar_out_dir)
env["AAR_OUT_DIR"] = aar_out_dir
cargo_binary = "cargo" + BIN_SUFFIX

3
python/servo/command_base.py
View file

@ -551,6 +551,9 @@ class CommandBase(object):
def android_build_dir(self, dev):
return path.join(self.get_target_dir(), self.config["android"]["target"], "debug" if dev else "release")
def android_aar_dir(self):
return path.join(self.context.topdir, "target", "android_aar")
def handle_android_target(self, target):
if target == "arm-linux-androideabi":
self.config["android"]["platform"] = "android-18"

11
python/servo/package_commands.py
View file

@ -180,7 +180,10 @@ class PackageCommands(CommandBase):
@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):
@CommandArgument('--flavor', '-f',
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()
if android is None:
android = self.config["build"]["android"]
@ -206,7 +209,11 @@ class PackageCommands(CommandBase):
else:
build_mode = "Release"
task_name = "assemble" + build_type + build_mode
flavor_name = "Main"
if flavor is not None:
flavor_name = flavor.title()
task_name = "assemble" + flavor_name + build_type + build_mode
try:
with cd(path.join("support", "android", "apk")):
subprocess.check_call(["./gradlew", "--no-daemon", task_name], env=env)