Move language pak files to assets.

build/android/gyp/write_build_config.py

 #!/usr/bin/env python
 #
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 215 matching lines @@
       '--deps-configs',
       help='List of paths for dependency\'s build_config files. ')
 
   # android_resources options
   parser.add_option('--srcjar', help='Path to target\'s resources srcjar.')
   parser.add_option('--resources-zip', help='Path to target\'s resources zip.')
   parser.add_option('--r-text', help='Path to target\'s R.txt file.')
   parser.add_option('--package-name',
       help='Java package name for these resources.')
   parser.add_option('--android-manifest', help='Path to android manifest.')
-  parser.add_option('--is-locale-resource', action='store_true',
-                    help='Whether it is locale resource.')
   parser.add_option('--resource-dirs', action='append', default=[],
                     help='GYP-list of resource dirs')
 
   # android_assets options
   parser.add_option('--asset-sources', help='List of asset sources.')
   parser.add_option('--asset-renaming-sources',
                     help='List of asset sources with custom destinations.')
   parser.add_option('--asset-renaming-destinations',
                     help='List of asset custom destinations.')
   parser.add_option('--disable-asset-compression', action='store_true',
                     help='Whether to disable asset compression.')
+  parser.add_option('--is-locale-asset', action='store_true',

[agrieve, 2016/09/21 01:06:42]

Idea: If we add the assets target directly to the android_apk() target, it's
likely that we could delete this locale-overriding logic altogether.
Additionally, if we did this, we could also use jar_excluded_patterns to drop in
a new version of the generated class for Monochrome vs Chrome

 wdyt?

[estevenson, 2016/09/21 19:50:56]

Done.

+                    help='Whether it is a locale asset.')
 
   # java library options
   parser.add_option('--jar-path', help='Path to target\'s jar output.')
   parser.add_option('--java-sources-file', help='Path to .sources file')
   parser.add_option('--bundled-srcjars',
       help='GYP-list of .srcjars that have been included in this java_library.')
   parser.add_option('--supports-android', action='store_true',
       help='Whether this library supports running on the Android platform.')
   parser.add_option('--requires-android', action='store_true',
       help='Whether this library requires running on the Android platform.')
@@ skipping 24 matching lines @@
 
   parser.add_option('--tested-apk-config',
       help='Path to the build config of the tested apk (for an instrumentation '
       'test apk).')
   parser.add_option('--proguard-enabled', action='store_true',
       help='Whether proguard is enabled for this apk.')
   parser.add_option('--proguard-configs',
       help='GYP-list of proguard flag files to use in final apk.')
   parser.add_option('--proguard-info',
       help='Path to the proguard .info output for this apk.')
-  parser.add_option('--has-alternative-locale-resource', action='store_true',
-      help='Whether there is alternative-locale-resource in direct deps')
+  parser.add_option('--has-alternative-locale-asset', action='store_true',
+      help='Whether there is alternative-locale-asset in direct deps')
   parser.add_option('--fail',
       help='GYP-list of error message lines to fail with.')
 
   options, args = parser.parse_args(argv)
 
   if args:
     parser.error('No positional arguments should be given.')
   if options.fail:
     parser.error('\n'.join(build_utils.ParseGnList(options.fail)))
 
@@ skipping 27 matching lines @@
       raise Exception(
           '--supports-android is required when using --requires-android')
 
   direct_deps_config_paths = build_utils.ParseGnList(options.deps_configs)
   direct_deps_config_paths = _FilterDepsPaths(direct_deps_config_paths,
                                               options.type)
 
   deps = Deps(direct_deps_config_paths)
   all_inputs = deps.AllConfigPaths()
 
-  # Remove other locale resources if there is alternative_locale_resource in
+  # Remove other locale assets if there is alternative_locale_asset in
   # direct deps.
-  if options.has_alternative_locale_resource:
-    alternative = [r['path'] for r in deps.Direct('android_resources')
-                   if r.get('is_locale_resource')]
-    # We can only have one locale resources in direct deps.
+  if options.has_alternative_locale_asset:
+    alternative = [r['path'] for r in deps.Direct('android_assets')
+                   if r.get('is_locale_asset')]
+    # We can only have one locale assets in direct deps.
     if len(alternative) != 1:
-      raise Exception('The number of locale resource in direct deps is wrong %d'
+      raise Exception('The number of locale assets in direct deps is wrong %d'
                        % len(alternative))
-    unwanted = [r['path'] for r in deps.All('android_resources')
-                if r.get('is_locale_resource') and r['path'] not in alternative]
+    unwanted = [r['path'] for r in deps.All('android_assets')
+                if r.get('is_locale_asset') and r['path'] not in alternative]
     for p in unwanted:
       deps.RemoveNonDirectDep(p)
 
 
   direct_library_deps = deps.Direct('java_library')
   all_library_deps = deps.All('java_library')
 
   all_resources_deps = deps.All('android_resources')
   # Resources should be ordered with the highest-level dependency first so that
   # overrides are done correctly.
@@ skipping 103 matching lines @@
       all_asset_sources.extend(build_utils.ParseGnList(options.asset_sources))
 
     deps_info['assets'] = {
         'sources': all_asset_sources
     }
     if options.asset_renaming_destinations:
       deps_info['assets']['outputs'] = (
           build_utils.ParseGnList(options.asset_renaming_destinations))
     if options.disable_asset_compression:
       deps_info['assets']['disable_compression'] = True
+    if options.is_locale_asset:
+      deps_info['is_locale_asset'] = True
 
   if options.type == 'android_resources':
     deps_info['resources_zip'] = options.resources_zip
     if options.srcjar:
       deps_info['srcjar'] = options.srcjar
     if options.android_manifest:
       manifest = AndroidManifest(options.android_manifest)
       deps_info['package_name'] = manifest.GetPackageName()
     if options.package_name:
       deps_info['package_name'] = options.package_name
     if options.r_text:
       deps_info['r_text'] = options.r_text
-    if options.is_locale_resource:
-      deps_info['is_locale_resource'] = True
 
     deps_info['resources_dirs'] = []
     if options.resource_dirs:
       for gyp_list in options.resource_dirs:
         deps_info['resources_dirs'].extend(build_utils.ParseGnList(gyp_list))
 
   if options.supports_android and options.type in ('android_apk',
                                                    'java_library'):
     # Lint all resources that are not already linted by a dependent library.
     owned_resource_dirs = set()
@@ skipping 160 matching lines @@
         _MergeAssets(deps.All('android_assets')))
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, options.build_config, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))