diff options
| author |  Hal Canary <halcanary@google.com> | 2018-02-20 11:31:25 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-20 17:14:33 +0000 |
| commit | cfac205c5e1d31588ba5da2c7cb551f0d067de09 (patch) | |
| tree | 827097e6d39c7d25603139c7958727e78e4207d9 /platform_tools | |
| parent | 97b3d2bcdb862b13a6a3f7a0b263bd04e2b8f911 (diff) | |
android_build_app: optionally disable gradle daemon
Motivation: sometimes the gradle daemon breaks things for me.
Change-Id: I920cd344a3b0f67cfa50529083fa7787d693637b
Reviewed-on: https://skia-review.googlesource.com/108564
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_build_app | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/platform_tools/android/bin/android_build_app b/platform_tools/android/bin/android_build_app index bee8cf508a..732ed04f10 100755 --- a/platform_tools/android/bin/android_build_app +++ b/platform_tools/android/bin/android_build_app @@ -14,6 +14,7 @@ import sys parser = argparse.ArgumentParser(description='builds skia android apps') parser.add_argument('-C', '--output_dir', help='ninja out dir') +parser.add_argument('--no-daemon', default=False, action='store_true', help='disable gradle daemon') parser.add_argument('app_name') args = parser.parse_args() @@ -32,12 +33,14 @@ if os.path.exists(args_gn_path): target_cpu = m.group(1) # build the apk using gradle +cmd = ['./apps/gradlew', + ':' + args.app_name + ':assemble' + target_cpu + android_buildtype, + '-papps/' + args.app_name, + '-P' + target_cpu + '.out.dir=' + os.path.abspath(args.output_dir)] +if not args.no_daemon: + cmd += ['--daemon'] try: - subprocess.check_call(['./apps/gradlew', - ':' + args.app_name + ':assemble' + target_cpu + android_buildtype, - '-papps/' + args.app_name, - '-P' + target_cpu + '.out.dir=' + os.path.abspath(args.output_dir), - '--daemon'], cwd=os.path.join(os.path.dirname(__file__), "..")) + subprocess.check_call(cmd, cwd=os.path.join(os.path.dirname(__file__), "..")) except subprocess.CalledProcessError as error: print error sys.exit("gradle build failed") |