Convert libchrome scripts to python 3

These appear to have already been updated to python 3
in the chromium repository, but it seems that it's rather
difficult to update libchrome in android, so just update
the scripts to python 3 independently for now.

Previous attempts to update libchrome: aosp/1753549,
https://groups.google.com/a/google.com/g/chromeos-libchrome/c/gyoJPi3i4Zo/m/PZKWEz-CAAAJ

Bug: 203436762
Test: m libchrome, m javac-check, diffed out/target/product/emulator_x86_64/obj/SHARED_LIBRARIES/libchrome_intermediates/libchrome.so and out/soong/.intermediates/external/libchrome/libmojo_jni_headers with and without this cl and got no changes
Change-Id: I8d05a73f6b94ce059b7b049480df47021abc4c7d

Author: Colecf

Android.bp

@@ -1169,27 +1169,13 @@ filegroup {
     ],
 }
 
-// Python in Chrome repository requires still Python 2.
-python_defaults {
-    name: "libmojo_scripts",
-    version: {
-        py2: {
-            enabled: true,
-        },
-        py3: {
-            enabled: false,
-        },
-    },
-}
-
 python_binary_host {
     name: "jni_generator",
     main: "base/android/jni_generator/jni_generator.py",
     srcs: [
         "base/android/jni_generator/jni_generator.py",
         "build/**/*.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 python_binary_host {
@@ -1200,7 +1186,6 @@ python_binary_host {
         "base/android/jni_generator/jni_registration_generator.py",
         "build/**/*.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 python_binary_host {
@@ -1218,7 +1203,6 @@ python_binary_host {
         "mojo/public/tools/bindings/generators/java_templates/*.tmpl",
         "mojo/public/tools/bindings/generators/js_templates/*.tmpl",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 genrule {
@@ -1250,7 +1234,6 @@ python_binary_host {
         "mojo/public/tools/bindings/pylib/mojom/generate/module.py",
         "mojo/public/tools/bindings/pylib/mojom/generate/pack.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 genrule {
@@ -1290,7 +1273,6 @@ python_binary_host {
     srcs: [
         "mojo/public/tools/bindings/mojom_types_downgrader.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 generate_mojom_downgraded_files {

base/android/jni_generator/jni_generator.py

@@ -17,14 +17,7 @@
 import textwrap
 import zipfile
 
-CHROMIUM_SRC = os.path.join(
-    os.path.dirname(__file__), os.pardir, os.pardir, os.pardir)
-BUILD_ANDROID_GYP = os.path.join(
-    CHROMIUM_SRC, 'build', 'android', 'gyp')
-
-sys.path.append(BUILD_ANDROID_GYP)
-
-from util import build_utils
+from build.android.gyp.util import build_utils
 
 
 # Match single line comments, multiline comments, character literals, and
@@ -53,7 +46,7 @@
                          replace_whitespace=False,
                          subsequent_indent=' ' * (indent + 4),
                          break_long_words=False)
-    for indent in xrange(50)]  # 50 chosen experimentally.
+    for indent in range(50)]  # 50 chosen experimentally.
 
 
 class ParseError(Exception):
@@ -799,7 +792,7 @@ def GetContent(self):
 
   @staticmethod
   def CreateFromFile(java_file_name, options):
-    contents = file(java_file_name).read()
+    contents = open(java_file_name).read()
     fully_qualified_class = ExtractFullyQualifiedJavaClassName(java_file_name,
                                                                contents)
     return JNIFromJavaSource(contents, fully_qualified_class, options)
@@ -856,7 +849,7 @@ def GetClassPathLines(self, classes, declare_only=False):
 "${JNI_CLASS_PATH}";
 """)
 
-    for full_clazz in classes.itervalues():
+    for full_clazz in classes.values():
       values = {
           'JAVA_CLASS': GetBinaryClassName(full_clazz),
           'JNI_CLASS_PATH': full_clazz,
@@ -882,7 +875,7 @@ def GetClassPathLines(self, classes, declare_only=False):
 JNI_REGISTRATION_EXPORT base::subtle::AtomicWord g_${JAVA_CLASS}_clazz = 0;
 """ + class_getter)
 
-    for full_clazz in classes.itervalues():
+    for full_clazz in classes.values():
       values = {
           'JAVA_CLASS': GetBinaryClassName(full_clazz),
       }
@@ -1311,13 +1304,13 @@ def GenerateJNIHeader(input_file, output_file, options):
       jni_from_java_source = JNIFromJavaSource.CreateFromFile(
           input_file, options)
       content = jni_from_java_source.GetContent()
-  except ParseError, e:
-    print e
+  except ParseError as e:
+    print(e)
     sys.exit(1)
   if output_file:
     WriteOutput(output_file, content)
   else:
-    print content
+    print(content)
 
 
 def WriteOutput(output_file, content):
@@ -1393,7 +1386,7 @@ def main(argv):
     input_file = options.input_file
   else:
     option_parser.print_help()
-    print '\nError: Must specify --jar_file or --input_file.'
+    print('\nError: Must specify --jar_file or --input_file.')
     return 1
   output_file = None
   if options.output_dir:

base/android/jni_generator/jni_generator_tests.py

@@ -53,7 +53,7 @@ def assertObjEquals(self, first, second):
     dict_first = first.__dict__
     dict_second = second.__dict__
     self.assertEquals(dict_first.keys(), dict_second.keys())
-    for key, value in dict_first.iteritems():
+    for key, value in dict_first.items():
       if (type(value) is list and len(value) and
           isinstance(type(value[0]), object)):
         self.assertListEquals(value, second.__getattribute__(key))
@@ -64,7 +64,7 @@ def assertObjEquals(self, first, second):
 
   def assertListEquals(self, first, second):
     self.assertEquals(len(first), len(second))
-    for i in xrange(len(first)):
+    for i in range(len(first)):
       if isinstance(first[i], object):
         self.assertObjEquals(first[i], second[i])
       else:

base/android/jni_generator/jni_registration_generator.py

@@ -10,11 +10,12 @@
 to register all native methods that exist within an application."""
 
 import argparse
-import jni_generator
 import multiprocessing
 import string
 import sys
-from util import build_utils
+
+import jni_generator
+from build.android.gyp.util import build_utils
 
 
 # All but FULL_CLASS_NAME, which is used only for sorting.
@@ -58,7 +59,7 @@ def GenerateJNIHeader(java_file_paths, output_file, args):
   if output_file:
     jni_generator.WriteOutput(output_file, header_content)
   else:
-    print header_content
+    print(header_content)
 
 
 def _DictForPath(path):
@@ -244,7 +245,7 @@ def _SubstituteNativeMethods(self, template):
     ret = []
     all_classes = self.helper.GetUniqueClasses(self.natives)
     all_classes[self.class_name] = self.fully_qualified_class
-    for clazz, full_clazz in all_classes.iteritems():
+    for clazz, full_clazz in all_classes.items():
       kmethods = self._GetKMethodsString(clazz)
       namespace_str = ''
       if self.namespace:
@@ -321,7 +322,7 @@ def main(argv):
   args.sources_files = build_utils.ParseGnList(args.sources_files)
 
   if not args.sources_files:
-    print '\nError: Must specify --sources_files.'
+    print('\nError: Must specify --sources_files.')
     return 1
 
   java_file_paths = []

build/android/gyp/util/build_utils.py

@@ -23,19 +23,8 @@
 #     //build/config/android/internal_rules.gni
 
 # Some clients do not add //build/android/gyp to PYTHONPATH.
-import md5_check  # pylint: disable=relative-import
-
-# pylib conflicts with mojo/public/tools/bindings/pylib. Prioritize
-# build/android/pylib.
-# PYTHONPATH wouldn't help in this case, because soong put source files under
-# temp directory for each build, so the abspath is unknown until the
-# execution.
-#sys.path.append(os.path.join(os.path.dirname(__file__),
-#                             os.pardir, os.pardir, os.pardir))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__),
-                                os.pardir, os.pardir))
-
-import gn_helpers
+import build.android.gyp.util.md5_check as md5_check # pylint: disable=relative-import
+import build.gn_helpers as gn_helpers
 
 # Definition copied from pylib/constants/__init__.py to avoid adding
 # a dependency on pylib.
@@ -44,7 +33,7 @@
                                  os.pardir, os.pardir, os.pardir, os.pardir)))
 
 HERMETIC_TIMESTAMP = (2001, 1, 1, 0, 0, 0)
-_HERMETIC_FILE_ATTR = (0644 << 16L)
+_HERMETIC_FILE_ATTR = (0o644 << 16)
 
 
 @contextlib.contextmanager
@@ -246,7 +235,7 @@ def _IsSymlink(zip_file, name):
 
   # The two high-order bytes of ZipInfo.external_attr represent
   # UNIX permissions and file type bits.
-  return stat.S_ISLNK(zi.external_attr >> 16L)
+  return stat.S_ISLNK(zi.external_attr >> 16)
 
 
 def ExtractAll(zip_path, path=None, no_clobber=True, pattern=None,
@@ -309,12 +298,12 @@ def AddToZipHermetic(zip_file, zip_path, src_path=None, data=None,
 
   if src_path and os.path.islink(src_path):
     zipinfo.filename = zip_path
-    zipinfo.external_attr |= stat.S_IFLNK << 16L # mark as a symlink
+    zipinfo.external_attr |= stat.S_IFLNK << 16 # mark as a symlink
     zip_file.writestr(zipinfo, os.readlink(src_path))
     return
 
   if src_path:
-    with file(src_path) as f:
+    with open(src_path) as f:
       data = f.read()
 
   # zipfile will deflate even when it makes the file bigger. To avoid
@@ -342,7 +331,7 @@ def DoZip(inputs, output, base_dir=None, compress_fn=None):
   """
   input_tuples = []
   for tup in inputs:
-    if isinstance(tup, basestring):
+    if isinstance(tup, str):
       tup = (os.path.relpath(tup, base_dir), tup)
     input_tuples.append(tup)
 
@@ -382,7 +371,7 @@ def MergeZips(output, input_zips, path_transform=None):
   path_transform = path_transform or (lambda p: p)
   added_names = set()
 
-  output_is_already_open = not isinstance(output, basestring)
+  output_is_already_open = not isinstance(output, str)
   if output_is_already_open:
     assert isinstance(output, zipfile.ZipFile)
     out_zip = output
@@ -445,7 +434,7 @@ def _ComputePythonDependencies():
   src/. The paths will be relative to the current directory.
   """
   _ForceLazyModulesToLoad()
-  module_paths = (m.__file__ for m in sys.modules.itervalues()
+  module_paths = (m.__file__ for m in sys.modules.values()
                   if m is not None and hasattr(m, '__file__'))
   abs_module_paths = map(os.path.abspath, module_paths)
 

build/android/gyp/util/jar_info_utils.py

@@ -44,7 +44,7 @@ def WriteJarInfoFile(info_path, info_data, source_file_map=None):
       temporary location.
   """
   with open(info_path, 'w') as info_file:
-    for fully_qualified_name, path in info_data.iteritems():
+    for fully_qualified_name, path in info_data.items():
       if source_file_map and path in source_file_map:
         path = source_file_map[path]
         assert not path.startswith('/tmp'), (

build/android/gyp/util/md5_check.py

@@ -78,10 +78,10 @@ def CallAndRecordIfStale(
     return
 
   if PRINT_EXPLANATIONS:
-    print '=' * 80
-    print 'Target is stale: %s' % record_path
-    print changes.DescribeDifference()
-    print '=' * 80
+    print('=' * 80)
+    print('Target is stale: %s' % record_path)
+    print(changes.DescribeDifference())
+    print('=' * 80)
 
   args = (changes,) if pass_changes else ()
   function(*args)

build/android/gyp/util/resource_utils.py

@@ -59,7 +59,7 @@ def CreateResourceInfoFile(files_to_zip, zip_path):
   """
   info_file_path = zip_path + '.info'
   with open(info_file_path, 'w') as info_file:
-    for archive_path, source_path in files_to_zip.iteritems():
+    for archive_path, source_path in files_to_zip.items():
       info_file.write('{},{}\n'.format(archive_path, source_path))
 
 
@@ -260,7 +260,7 @@ def CreateRJavaFiles(srcjar_dir, package, main_r_txt_file,
       if entry:
         resources_by_type[entry.resource_type].append(entry)
 
-  for package, resources_by_type in resources_by_package.iteritems():
+  for package, resources_by_type in resources_by_package.items():
     _CreateRJavaSourceFile(srcjar_dir, package, resources_by_type,
                            rjava_build_options)
 
@@ -296,7 +296,7 @@ def _RenderRJavaSource(package, resources_by_type, rjava_build_options):
   """Render an R.java source file. See _CreateRJaveSourceFile for args info."""
   final_resources_by_type = collections.defaultdict(list)
   non_final_resources_by_type = collections.defaultdict(list)
-  for res_type, resources in resources_by_type.iteritems():
+  for res_type, resources in resources_by_type.items():
     for entry in resources:
       # Entries in stylable that are not int[] are not actually resource ids
       # but constants.

build/android/pylib/constants/host_paths_unittest.py

@@ -40,7 +40,7 @@ def test_GetAaptPath(self):
     self.assertEqual(host_paths.GetAaptPath(), _EXPECTED_AAPT_PATH)
 
   def test_ToolPath(self):
-    for cpu_arch, binprefix in _EXPECTED_NDK_TOOL_SUBDIR_MAP.iteritems():
+    for cpu_arch, binprefix in _EXPECTED_NDK_TOOL_SUBDIR_MAP.items():
       expected_binprefix = os.path.join(constants.ANDROID_NDK_ROOT, binprefix)
       expected_path = expected_binprefix + 'foo'
       self.assertEqual(host_paths.ToolPath('foo', cpu_arch), expected_path)

build/android/pylib/content_settings.py

@@ -29,7 +29,7 @@ def _GetTypeBinding(value):
       return 's'
     raise ValueError('Unsupported type %s' % type(value))
 
-  def iteritems(self):
+  def items(self):
     # Example row:
     # 'Row: 0 _id=13, name=logging_id2, value=-1fccbaa546705b05'
     for row in self._device.RunShellCommand(

build/android/pylib/device_settings.py

@@ -33,7 +33,7 @@ def ConfigureContentSettings(device, desired_settings):
     for key, value in key_value:
       settings[key] = value
     logging.info('\n%s %s', table, (80 - len(table)) * '-')
-    for key, value in sorted(settings.iteritems()):
+    for key, value in sorted(settings.items()):
       logging.info('\t%s: %s', key, value)
 
 

build/check_gn_headers.py

@@ -110,7 +110,7 @@ def ParseGNProjectJSON(gn, out_dir, tmp_out):
   """Parse GN output and get the header files"""
   all_headers = set()
 
-  for _target, properties in gn['targets'].iteritems():
+  for _target, properties in gn['targets'].items():
     sources = properties.get('sources', [])
     public = properties.get('public', [])
     # Exclude '"public": "*"'.
@@ -292,7 +292,7 @@ def PrintError(msg):
         print '  ', cc
 
     print '\nMissing headers sorted by number of affected object files:'
-    count = {k: len(v) for (k, v) in d.iteritems()}
+    count = {k: len(v) for (k, v) in d.items()}
     for f in sorted(count, key=count.get, reverse=True):
       if f in missing:
         print count[f], f