Browse Source

autoninja.py: Make use_android_build_server enabled by default

We're switching the GN arg to be default-enabled for local builds.

Bug: 404503040
Change-Id: I710b8fa38bf4ce97d592861b28a49b0bc867b702
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6454372
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Andrew Grieve 4 months ago
parent
commit
73a3fbf1fa
1 changed files with 12 additions and 3 deletions
  1. 12 3
      autoninja.py

+ 12 - 3
autoninja.py

@@ -261,10 +261,11 @@ def _main_inner(input_args, build_id, should_collect_logs=False):
             )
             )
             print(file=sys.stderr)
             print(file=sys.stderr)
 
 
+    is_android = False
     use_remoteexec = False
     use_remoteexec = False
     use_reclient = None
     use_reclient = None
-    use_android_build_server = False
     use_siso = None
     use_siso = None
+    use_android_build_server = None
 
 
     # Attempt to auto-detect remote build acceleration. We support gn-based
     # Attempt to auto-detect remote build acceleration. We support gn-based
     # builds, where we look for args.gn in the build tree, and cmake-based
     # builds, where we look for args.gn in the build tree, and cmake-based
@@ -296,8 +297,11 @@ def _main_inner(input_args, build_id, should_collect_logs=False):
             if k == "use_reclient" and v == "false":
             if k == "use_reclient" and v == "false":
                 use_reclient = False
                 use_reclient = False
                 continue
                 continue
-            if k == "android_static_analysis" and v == '"build_server"':
-                use_android_build_server = True
+            if k == "target_os" and v == '"android"':
+                is_android = True
+                continue
+            if k == "android_static_analysis" and v != '"build_server"':
+                use_android_build_server = False
                 continue
                 continue
 
 
         if use_siso is None:
         if use_siso is None:
@@ -311,6 +315,11 @@ def _main_inner(input_args, build_id, should_collect_logs=False):
                 else:
                 else:
                     use_reclient = values["use_reclient_on_ninja"]
                     use_reclient = values["use_reclient_on_ninja"]
 
 
+    # Use the server for target_os="android" (where it is relevant), unless it
+    # is disabled via GN arg.
+    if use_android_build_server is None and is_android:
+        use_android_build_server = True
+
     if use_remoteexec:
     if use_remoteexec:
         if use_reclient:
         if use_reclient:
             project = _reclient_rbe_project()
             project = _reclient_rbe_project()