commit d6c7ee734bb8d91defb9f6cb9363640caa23c04c
author Junji Watanabe <jwata@google.com> Wed Aug 31 15:40:26 2022 +0900
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Aug 31 07:56:42 2022 +0000
tree 3ba1399519bd0e5a206c00c2468e6fad71a309ff
parent d42581af77ee906a8657a7cbdaf195bf2cd4dc8a

Fix typo in build_aar.py

Android release builders are failing for this typo.
https://ci.chromium.org/ui/p/webrtc/builders/ci/Android32%20(M%20Nexus5X)/20419/overview


Bug: b/243628179
Change-Id: I73353c0e44cc95feb197c4d95059234c2465c0c8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/273601
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37963}

tools_webrtc/android/build_aar.py

diff --git a/tools_webrtc/android/build_aar.py b/tools_webrtc/android/build_aar.py
index 32a9ed6..42a902c 100755
--- a/tools_webrtc/android/build_aar.py
+++ b/tools_webrtc/android/build_aar.py
@@ -167,7 +167,7 @@
   raise Exception('Unknown arch: ' + arch)
 
 
-def Build(build_dir, arch, use_goma, use_remoteexe, extra_gn_args,
+def Build(build_dir, arch, use_goma, use_remoteexec, extra_gn_args,
           extra_gn_switches, extra_ninja_switches):
   """Generates target architecture using GN and builds it using ninja."""
   logging.info('Building: %s', arch)
@@ -179,7 +179,7 @@
       'rtc_include_tests': False,
       'target_cpu': _GetTargetCpu(arch),
       'use_goma': use_goma,
-      'use_remoteexec': use_remoteexe,
+      'use_remoteexec': use_remoteexec,
   }
   arm_version = _GetArmVersion(arch)
   if arm_version:
@@ -192,7 +192,7 @@
   _RunGN(gn_args_list)
 
   ninja_args = TARGETS[:]
-  if use_goma or use_remoteexe:
+  if use_goma or use_remoteexec:
     ninja_args.extend(['-j', '200'])
   ninja_args.extend(extra_ninja_switches)
   _RunNinja(output_directory, ninja_args)
@@ -228,7 +228,7 @@
 def BuildAar(archs,
              output_file,
              use_goma=False,
-             use_remoteexe=False,
+             use_remoteexec=False,
              extra_gn_args=None,
              ext_build_dir=None,
              extra_gn_switches=None,
@@ -240,7 +240,7 @@
   build_dir = ext_build_dir if ext_build_dir else tempfile.mkdtemp()
 
   for arch in archs:
-    Build(build_dir, arch, use_goma, use_remoteexe, extra_gn_args,
+    Build(build_dir, arch, use_goma, use_remoteexec, extra_gn_args,
           extra_gn_switches, extra_ninja_switches)
 
   with zipfile.ZipFile(output_file, 'w') as aar_file:
@@ -260,7 +260,7 @@
   args = _ParseArgs()
   logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
 
-  BuildAar(args.arch, args.output, args.use_goma, args.use_remoteexe,
+  BuildAar(args.arch, args.output, args.use_goma, args.use_remoteexec,
            args.extra_gn_args, args.build_dir, args.extra_gn_switches,
            args.extra_ninja_switches, args.use_unstripped_libs)