Shrink onResourcesLoaded() code size in webview/monochrome R.java

build/android/gyp/process_resources.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Process Android resources to generate R.java, and prepare for packaging.
 
 This will crunch images and generate v14 compatible resources
 (see generate_v14_compatible_resources.py).
@@ skipping 181 matching lines @@
         raise Exception('Unexpected line in R.txt: %s' % line)
       java_type, resource_type, name, value = m.groups()
       ret.append(TextSymbolsEntry(java_type, resource_type, name, value))
   return ret
 
 
 def _CreateRJavaFile(package, resources_by_type, shared_resources):
   """Generates the contents of a R.java file."""
   # Keep these assignments all on one line to make diffing against regular
   # aapt-generated files easier.
   create_id = ('{{ e.resource_type }}.{{ e.name }} = '

[agrieve, 2016/12/12 20:40:51]

nit: could now shorten these with ^=

[F, 2016/12/12 21:13:12]

Done.

-               '({{ e.resource_type }}.{{ e.name }} & 0x00ffffff) |'
-               ' (packageId << 24);')
+               '{{ e.resource_type }}.{{ e.name }} ^ packageIdTransform;')
   create_id_arr = ('{{ e.resource_type }}.{{ e.name }}[i] = '
-                   '({{ e.resource_type }}.{{ e.name }}[i] & 0x00ffffff) |'
-                   ' (packageId << 24);')
+                   '{{ e.resource_type }}.{{ e.name }}[i] ^'
+                   ' packageIdTransform;')
   # Here we diverge from what aapt does. Because we have so many
   # resources, the onResourcesLoaded method was exceeding the 64KB limit that
   # Java imposes. For this reason we split onResourcesLoaded into different
   # methods for each resource type.
   template = Template("""/* AUTO-GENERATED FILE.  DO NOT MODIFY. */
 
 package {{ package }};
 
 public final class R {
     {% for resource_type in resource_types %}
     public static final class {{ resource_type }} {
         {% for e in resources[resource_type] %}
         {% if shared_resources %}
         public static {{ e.java_type }} {{ e.name }} = {{ e.value }};
         {% else %}
         public static final {{ e.java_type }} {{ e.name }} = {{ e.value }};
         {% endif %}
         {% endfor %}
     }
     {% endfor %}
     {% if shared_resources %}
     public static void onResourcesLoaded(int packageId) {
+        assert !sResourcesDidLoad;
+        sResourcesDidLoad = true;
+        int packageIdTransform = (packageId ^ 0x7f) << 24;
         {% for resource_type in resource_types %}
-        onResourcesLoaded{{ resource_type|title }}(packageId);
+        onResourcesLoaded{{ resource_type|title }}(packageIdTransform);
         {% for e in resources[resource_type] %}
         {% if e.java_type == 'int[]' %}
         for(int i = 0; i < {{ e.resource_type }}.{{ e.name }}.length; ++i) {
             """ + create_id_arr + """
         }
         {% endif %}
         {% endfor %}
         {% endfor %}
     }
+    private static boolean sResourcesDidLoad;

[agrieve, 2016/12/12 20:40:51]

nit: can you move this to come at the top of the class (line 216)

[F, 2016/12/12 21:13:13]

Done.

     {% for res_type in resource_types %}
-    private static void onResourcesLoaded{{ res_type|title }}(int packageId) {
+    private static void onResourcesLoaded{{ res_type|title }} (
+        int packageIdTransform) {

[agrieve, 2016/12/12 20:40:51]

nit: indent 4 more spaces

[F, 2016/12/12 21:13:13]

Done.

         {% for e in resources[res_type] %}
         {% if res_type != 'styleable' and e.java_type != 'int[]' %}
         """ + create_id + """
         {% endif %}
         {% endfor %}
     }
     {% endfor %}
     {% endif %}
 }
 """, trim_blocks=True, lstrip_blocks=True)
@@ skipping 279 matching lines @@
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths,
       # TODO(agrieve): Remove R_dir when it's no longer used (used only by GYP).
       force=options.R_dir)
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])