diff options
| author |  Hal Canary <halcanary@google.com> | 2018-02-07 14:56:29 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-09 22:13:23 +0000 |
| commit | c87fbf93d0c9329a1f14da55aa96a27547ae0df6 (patch) | |
| tree | 790c77e4d89c4d15dffd09bd15e01a0403a04faf /platform_tools/android/bin/android_build_app | |
| parent | 7fcfb621998648ba018e3b89e2cab3135bd46a1f (diff) | |
Android Tools: build x86_64 correctly.
- Fix some naming confusion between `x64` and `x86-64`.
- SkQP Universal (multi-arch apk) Build Script
[tools/skqp/make_universal_apk]
- skqp/build.gradle: add `universal` product flavor
- skqp manifest: make debug build optional.
No-Try: true
Change-Id: Ic8cd88719a34786ab2d53771749b2beb9db98be5
Reviewed-on: https://skia-review.googlesource.com/105023
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Stephan Altmueller <stephana@google.com>
Diffstat (limited to 'platform_tools/android/bin/android_build_app')
| -rwxr-xr-x | platform_tools/android/bin/android_build_app | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/platform_tools/android/bin/android_build_app b/platform_tools/android/bin/android_build_app index 5f47ff20a0..bee8cf508a 100755 --- a/platform_tools/android/bin/android_build_app +++ b/platform_tools/android/bin/android_build_app @@ -19,7 +19,6 @@ parser.add_argument('app_name') args = parser.parse_args() target_cpu = "arm64" -android_variant = "" android_buildtype = "debug" if args.output_dir == None: @@ -32,21 +31,10 @@ if os.path.exists(args_gn_path): if m: target_cpu = m.group(1) -if target_cpu == "arm": - android_variant = "arm" -elif target_cpu == "arm64": - android_variant = "arm64" -elif target_cpu == "x86": - android_variant = "x86" -elif target_cpu == "x64": - android_variant = "x86_64" -else: - sys.exit("unknown target_cpu") - # build the apk using gradle try: subprocess.check_call(['./apps/gradlew', - ':' + args.app_name + ':assemble' + android_variant + android_buildtype, + ':' + 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__), "..")) @@ -57,6 +45,6 @@ except subprocess.CalledProcessError as error: # copy apk back into the main out directory current_dir = os.path.dirname(__file__) apk_src = os.path.join(current_dir, "..", "apps", args.app_name, "build", "outputs", "apk", - args.app_name + "-" + android_variant + "-" + android_buildtype + ".apk") + args.app_name + "-" + target_cpu + "-" + android_buildtype + ".apk") apk_dst = os.path.join(args.output_dir, args.app_name + ".apk") shutil.copyfile(apk_src, apk_dst) |