Merging 18 commit(s) from Chromium's toolchain-utils am: 0ae38c8498 am: 2a19d36a82 am: e617e3393dr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-release

Change-Id: I3f25c7ee034b2e20e37ed941b8eae24eec7043eb

1 files changed, 35 insertions, 33 deletions

diff --git a/build_chromeos.py b/build_chromeos.py
index 0b0676d1..e275da1f 100755
--- a/build_chromeos.py
+++ b/build_chromeos.py
@@ -1,6 +1,10 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 #
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
 """Script to checkout the ChromeOS source.
 
 This script sets up the ChromeOS source in the given directory, matching a
@@ -92,8 +96,8 @@ def Main(argv):
       dest='debug',
       default=False,
       action='store_true',
-      help=("Optional. Build chrome browser with \"-g -O0\". "
-            "Notice, this also turns on \'--dev\'. "
+      help=('Optional. Build chrome browser with "-g -O0". '
+            "Notice, this also turns on '--dev'. "
             'Defaults to False.'))
   parser.add_argument(
       '--env', dest='env', default='', help='Env to pass to build_packages.')
@@ -133,7 +137,7 @@ def Main(argv):
          'This flags is used internally by this script. '
          'Contact the author for more detail.'))
 
-  if options.rebuild == True:
+  if options.rebuild:
     build_packages_env += ' EXTRA_BOARD_FLAGS=-e'
     # EXTRA_BOARD_FLAGS=-e should clean up the object files for the chrome
     # browser but it doesn't. So do it here.
@@ -166,10 +170,9 @@ def Main(argv):
   if not os.path.isdir(options.chromeos_root + '/chroot/build/' +
                        options.board) or options.clobber_board:
     # Run build_tc.py from binary package
-    ret = cmd_executer.ChrootRunCommand(options.chromeos_root,
-                                        misc.GetSetupBoardCommand(
-                                            options.board,
-                                            force=options.clobber_board))
+    ret = cmd_executer.ChrootRunCommand(
+        options.chromeos_root,
+        misc.GetSetupBoardCommand(options.board, force=options.clobber_board))
     logger.GetLogger().LogFatalIf(ret, 'setup_board failed')
   else:
     logger.GetLogger().LogOutput('Did not setup_board '
@@ -179,23 +182,23 @@ def Main(argv):
     # Perform 2-step build_packages to build a debug chrome browser.
 
     # Firstly, build everything that chromeos-chrome depends on normally.
-    if options.rebuild == True:
+    if options.rebuild:
       # Give warning about "--rebuild" and "--debug". Under this combination,
       # only dependencies of "chromeos-chrome" get rebuilt.
       logger.GetLogger().LogWarning(
-          "\"--rebuild\" does not correctly re-build every package when "
-          "\"--debug\" is enabled. ")
+          '--rebuild" does not correctly re-build every package when '
+          '"--debug" is enabled. ')
 
       # Replace EXTRA_BOARD_FLAGS=-e with "-e --onlydeps"
       build_packages_env = build_packages_env.replace(
-          'EXTRA_BOARD_FLAGS=-e', 'EXTRA_BOARD_FLAGS=\"-e --onlydeps\"')
+          'EXTRA_BOARD_FLAGS=-e', 'EXTRA_BOARD_FLAGS="-e --onlydeps"')
     else:
       build_packages_env += ' EXTRA_BOARD_FLAGS=--onlydeps'
 
     ret = cmd_executer.ChrootRunCommand(
-        options.chromeos_root, "CFLAGS=\"$(portageq-%s envvar CFLAGS) %s\" "
-        "CXXFLAGS=\"$(portageq-%s envvar CXXFLAGS) %s\" "
-        "LDFLAGS=\"$(portageq-%s envvar LDFLAGS) %s\" "
+        options.chromeos_root, 'CFLAGS="$(portageq-%s envvar CFLAGS) %s" '
+        'CXXFLAGS="$(portageq-%s envvar CXXFLAGS) %s" '
+        'LDFLAGS="$(portageq-%s envvar LDFLAGS) %s" '
         'CHROME_ORIGIN=SERVER_SOURCE '
         '%s '
         '%s --skip_chroot_upgrade'
@@ -208,16 +211,16 @@ def Main(argv):
 
     # Secondly, build chromeos-chrome using debug mode.
     # Replace '--onlydeps' with '--nodeps'.
-    if options.rebuild == True:
+    if options.rebuild:
       build_packages_env = build_packages_env.replace(
-          'EXTRA_BOARD_FLAGS=\"-e --onlydeps\"', 'EXTRA_BOARD_FLAGS=--nodeps')
+          'EXTRA_BOARD_FLAGS="-e --onlydeps"', 'EXTRA_BOARD_FLAGS=--nodeps')
     else:
       build_packages_env = build_packages_env.replace(
           'EXTRA_BOARD_FLAGS=--onlydeps', 'EXTRA_BOARD_FLAGS=--nodeps')
     ret = cmd_executer.ChrootRunCommand(
-        options.chromeos_root, "CFLAGS=\"$(portageq-%s envvar CFLAGS) %s\" "
-        "CXXFLAGS=\"$(portageq-%s envvar CXXFLAGS) %s\" "
-        "LDFLAGS=\"$(portageq-%s envvar LDFLAGS) %s\" "
+        options.chromeos_root, 'CFLAGS="$(portageq-%s envvar CFLAGS) %s" '
+        'CXXFLAGS="$(portageq-%s envvar CXXFLAGS) %s" '
+        'LDFLAGS="$(portageq-%s envvar LDFLAGS) %s" '
         'CHROME_ORIGIN=SERVER_SOURCE BUILDTYPE=Debug '
         '%s '
         '%s --skip_chroot_upgrade'
@@ -237,11 +240,11 @@ def Main(argv):
     # Up to now, we have a debug built chromos-chrome browser.
     # Fall through to build the rest of the world.
 
-    # Build packages
+  # Build packages
   ret = cmd_executer.ChrootRunCommand(
-      options.chromeos_root, "CFLAGS=\"$(portageq-%s envvar CFLAGS) %s\" "
-      "CXXFLAGS=\"$(portageq-%s envvar CXXFLAGS) %s\" "
-      "LDFLAGS=\"$(portageq-%s envvar LDFLAGS) %s\" "
+      options.chromeos_root, 'CFLAGS="$(portageq-%s envvar CFLAGS) %s" '
+      'CXXFLAGS="$(portageq-%s envvar CXXFLAGS) %s" '
+      'LDFLAGS="$(portageq-%s envvar LDFLAGS) %s" '
       'CHROME_ORIGIN=SERVER_SOURCE '
       '%s '
       '%s --skip_chroot_upgrade' %
@@ -261,19 +264,18 @@ def Main(argv):
   flags_file_name = 'flags.txt'
   flags_file_path = ('%s/src/build/images/%s/latest/%s' %
                      (options.chromeos_root, options.board, flags_file_name))
-  flags_file = open(flags_file_path, 'wb')
-  flags_file.write('CFLAGS=%s\n' % options.cflags)
-  flags_file.write('CXXFLAGS=%s\n' % options.cxxflags)
-  flags_file.write('LDFLAGS=%s\n' % options.ldflags)
-  flags_file.close()
+  with open(flags_file_path, 'w', encoding='utf-8') as flags_file:
+    flags_file.write('CFLAGS=%s\n' % options.cflags)
+    flags_file.write('CXXFLAGS=%s\n' % options.cxxflags)
+    flags_file.write('LDFLAGS=%s\n' % options.ldflags)
 
   if options.label:
     image_dir_path = ('%s/src/build/images/%s/latest' % (options.chromeos_root,
                                                          options.board))
     real_image_dir_path = os.path.realpath(image_dir_path)
-    command = ('ln -sf -T %s %s/%s' %
-               (os.path.basename(real_image_dir_path),
-                os.path.dirname(real_image_dir_path), options.label))
+    command = ('ln -sf -T %s %s/%s' % (os.path.basename(real_image_dir_path),
+                                       os.path.dirname(real_image_dir_path),
+                                       options.label))
 
     ret = cmd_executer.RunCommand(command)
     logger.GetLogger().LogFatalIf(