Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files.

chrome/chrome_resources.gyp

Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 85db5e3b758f5c2ec2e2610ebb28c1de90050065..ba9ecaf9eefcc3a93e84582b6a5f5abccfbb67be 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -221,52 +221,6 @@
         'theme_resources_gen',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
       ],
-      'conditions': [
-        ['OS != "mac"', {
-          # Copy pak files to the product directory. These files will be picked
-          # up by the following installer scripts:
-          #   - Windows: chrome/installer/mini_installer/chrome.release
-          #   - Linux: chrome/installer/linux/internal/common/installer.include
-          # Ensure that the above scripts are updated when adding or removing
-          # pak files.
-          # Copying files to the product directory is not needed on the Mac
-          # since the framework build phase will copy them into the framework
-          # bundle directly.
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': [
-                '<(grit_out_dir)/theme_resources_100_percent.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
-              ],
-            },
-          ],
-        }],
-        ['(OS != "mac" and enable_hidpi == 1) or chromeos == 1', {
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': [
-                '<(grit_out_dir)/theme_resources_200_percent.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
-              ],
-            },
-          ],
-        }],
-        ['enable_touch_ui==1', {
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': [
-                '<(grit_out_dir)/theme_resources_touch_100_percent.pak',
-                '<(grit_out_dir)/theme_resources_touch_200_percent.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_200_percent.pak',
-              ],
-            },
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'packed_extra_resources',
@@ -329,11 +283,30 @@
         {
           'includes': ['chrome_repack_pseudo_locales.gypi']
         },
+        {
+          'includes': ['chrome_repack_chrome_100_percent.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_200_percent.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
+        },
+        {
+          'includes': ['chrome_repack_chrome_touch_200_percent.gypi']
+        },
       ],
       'conditions': [
         ['OS != "mac"', {
-          # We'll install the resource files to the product directory.  The Mac
-          # copies the results over as bundle resources in its own special way.
+          # Copy pak files to the product directory. These files will be picked
+          # up by the following installer scripts:
+          #   - Windows: chrome/installer/mini_installer/chrome.release
+          #   - Linux: chrome/installer/linux/internal/common/installer.include
+          # Ensure that the above scripts are updated when adding or removing
+          # pak files.
+          # Copying files to the product directory is not needed on the Mac
+          # since the framework build phase will copy them into the framework
+          # bundle directly.
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)',
@@ -342,6 +315,12 @@
               ],
             },
             {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak'
+              ],
+            },
+            {
               'destination': '<(PRODUCT_DIR)/locales',
               'files': [
                 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))'
@@ -368,6 +347,36 @@
                 },
               ],
             }],
+            ['enable_hidpi == 1 or chromeos == 1', {

[Rick Byers, 2012/07/31 19:38:17]

Would be nice to simplify to just enable_hidpi==1.  Perhaps chromeos=1 should
always set enable_hidpi=1, or maybe with it being board-specific now we should
plumb it through.

Anyway you're just moving the existing condition so this is fine for now if it's
extra work to clean it up.

[flackr, 2012/07/31 19:48:22]

Yes, we can probably just use enable_hidpi. I don't think chromeos==1 should
imply enable_hidpi since that's board specific as you mentioned.

[Josh Horwich, 2012/08/01 23:47:58]

Drive-by question: Wouldn't this mean that HiDPI external monitors wouldn't get
HiDPI assets when plugged into a ChromeOS device whose build doesn't specify
enable_hidpi? If so, is that the desired behavior?

Also, if we do remove 'chromeos==1' here, I suppose it needs to be removed from
the chrome_touch_200_percent.pak section below.

[Rick Byers, 2012/08/02 00:30:46]

Yes, see http://code.google.com/p/chromium-os/issues/detail?id=32711
 

[flackr, 2012/08/07 13:52:00]

You're right, Done.

+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': [
+                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
+                  ],
+                },
+              ],
+            }],
+            ['enable_touch_ui==1', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': [
+                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
+                  ],
+                },
+              ],
+            }],
+            ['(enable_hidpi == 1 or chromeos == 1) and enable_touch_ui==1', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': [
+                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_200_percent.pak',
+                  ],
+                },
+              ],
+            }],
           ], # conditions
         }], # end OS != "mac"
       ], # conditions