From 3146dbbd11fd7dc3903f6cb59ca8a5e62fb97b89 Mon Sep 17 00:00:00 2001 From: wchen342 Date: Tue, 6 Apr 2021 14:32:28 +0300 Subject: [PATCH] Fix copy file extension --- app/android/BUILD.gn | 2 +- build/android/BUILD.gn | 5 ++--- build/config.gni | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/android/BUILD.gn b/app/android/BUILD.gn index 5facb6262cc..8fd3ea90eae 100755 --- a/app/android/BUILD.gn +++ b/app/android/BUILD.gn @@ -19,7 +19,7 @@ action("create_symbol_archive") { inputs = [ script, shell_script, - brave_apk_output, + brave_aab_output, ] outputs = [ archive_name ] diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn index aed8f7c0d4b..a15b44b090e 100755 --- a/build/android/BUILD.gn +++ b/build/android/BUILD.gn @@ -23,8 +23,7 @@ action("sign_app") { } outputs = [ "$target_sign_app_path-signed" ] - args = [] - args += [ + args = [ rebase_path(_zipalign, root_out_dir), rebase_path(_apksigner, root_out_dir), rebase_path(_jarsigner, root_out_dir), @@ -58,7 +57,7 @@ copy("brave") { sources += [ "$root_out_dir/apks/ChromeModernPublic.aab" ] } } - outputs = [ brave_apk_output ] + outputs = [ brave_aab_output ] } java_strings_grd("android_brave_strings_grd") { diff --git a/build/config.gni b/build/config.gni index 00e500893e9..04584f7421f 100644 --- a/build/config.gni +++ b/build/config.gni @@ -133,16 +133,16 @@ if (is_win) { is_release_channel = brave_channel == "" -brave_apk_output = "" +brave_aab_output = "" if (is_android) { - brave_apk_output += "$root_out_dir/apks/Brave" + brave_aab_output += "$root_out_dir/apks/Brave" if (target_apk_base == "modern") { assert(target_cpu != "arm64" && target_cpu != "x64") - brave_apk_output += "Modern" + brave_aab_output += "Modern" } else if (target_cpu == "arm64" || target_cpu == "x64" || - target_apk_base == "mono") { - brave_apk_output += "Mono" + target_apk_base == "mono") { + brave_aab_output += "Mono" } - brave_apk_output += "$target_cpu.apk" + brave_aab_output += "$target_cpu.aab" }