From 41005c3e80af4673adcfaf56f21a57b93995ec9d Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Fri, 20 Jul 2018 15:22:12 -0400 Subject: [PATCH] Update android_build_app Gradle output location Looks like new Gradle (4.1) changed the output location from build/outputs/apk/{app}-{target_cpu}-{android_buildtype}.apk to build/outputs/apk/{target_cpu}/{android_buildtype}/{app}-{target_cpu}-{android_buildtype}.apk TBR= Change-Id: I45ed38e1f1655f82ef4a205ef7e8baf3f2da50af Reviewed-on: https://skia-review.googlesource.com/142806 Reviewed-by: Florin Malita Reviewed-by: Hal Canary Commit-Queue: Florin Malita --- platform_tools/android/bin/android_build_app | 1 + 1 file changed, 1 insertion(+) diff --git a/platform_tools/android/bin/android_build_app b/platform_tools/android/bin/android_build_app index 732ed04f10..e650e10feb 100755 --- a/platform_tools/android/bin/android_build_app +++ b/platform_tools/android/bin/android_build_app @@ -48,6 +48,7 @@ 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", + target_cpu, android_buildtype, 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)