diff options
author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 16:43:06 +0000 |
---|---|---|
committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 16:43:06 +0000 |
commit | 708bfade92371f332193719397c26f8568363cdb (patch) | |
tree | 55ab3c70bdb401e3268a3953c9a9946d84c7a1f3 /chrome | |
parent | 123d80775a39200f05bd6baf5ac779bee18030e6 (diff) | |
download | chromium_src-708bfade92371f332193719397c26f8568363cdb.zip chromium_src-708bfade92371f332193719397c26f8568363cdb.tar.gz chromium_src-708bfade92371f332193719397c26f8568363cdb.tar.bz2 |
Reland 150411 - "Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files."
BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.
Review URL: https://chromiumcodereview.appspot.com/10825111
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10827225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/chrome_dll.gypi | 7 | ||||
-rw-r--r-- | chrome/chrome_repack_chrome_100_percent.gypi | 20 | ||||
-rw-r--r-- | chrome/chrome_repack_chrome_200_percent.gypi | 21 | ||||
-rw-r--r-- | chrome/chrome_repack_chrome_touch_100_percent.gypi | 20 | ||||
-rw-r--r-- | chrome/chrome_repack_chrome_touch_200_percent.gypi | 21 | ||||
-rw-r--r-- | chrome/chrome_resources.gyp | 106 | ||||
-rw-r--r-- | chrome/installer/mini_installer/chrome.release | 9 | ||||
-rw-r--r-- | chrome/tools/build/chromeos/FILES.cfg | 15 | ||||
-rw-r--r-- | chrome/tools/build/linux/FILES.cfg | 15 | ||||
-rw-r--r-- | chrome/tools/build/win/FILES.cfg | 51 |
10 files changed, 171 insertions, 114 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 5156e57..90e0b86 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -289,9 +289,8 @@ 'app/theme/otr_icon.pdf', 'browser/mac/install.sh', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', - '<(grit_out_dir)/theme_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', # Note: pseudo_locales are generated via the packed_resources # dependency but not copied to the final target. See @@ -532,9 +531,7 @@ }], ['enable_hidpi==1', { 'mac_bundle_resources': [ - '<(grit_out_dir)/theme_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', ], }], ], # conditions diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi new file mode 100644 index 0000000..d5abf53 --- /dev/null +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -0,0 +1,20 @@ +# 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. +{ + 'action_name': 'repack_chrome_resources_100_percent', + 'variables': { + 'pak_inputs': [ + '<(grit_out_dir)/theme_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], +} diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi new file mode 100644 index 0000000..8384b9ec --- /dev/null +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -0,0 +1,21 @@ +# 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. +{ + 'action_name': 'repack_chrome_resources_200_percent', + 'variables': { + 'pak_inputs': [ + '<(grit_out_dir)/theme_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], +} diff --git a/chrome/chrome_repack_chrome_touch_100_percent.gypi b/chrome/chrome_repack_chrome_touch_100_percent.gypi new file mode 100644 index 0000000..a13ff64 --- /dev/null +++ b/chrome/chrome_repack_chrome_touch_100_percent.gypi @@ -0,0 +1,20 @@ +# 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. +{ + 'action_name': 'repack_chrome_touch_resources_100_percent', + 'variables': { + 'pak_inputs': [ + '<(grit_out_dir)/theme_resources_touch_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak', + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], +} diff --git a/chrome/chrome_repack_chrome_touch_200_percent.gypi b/chrome/chrome_repack_chrome_touch_200_percent.gypi new file mode 100644 index 0000000..33cbb4f --- /dev/null +++ b/chrome/chrome_repack_chrome_touch_200_percent.gypi @@ -0,0 +1,21 @@ +# 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. +{ + 'action_name': 'repack_chrome_touch_resources_200_percent', + 'variables': { + 'pak_inputs': [ + '<(grit_out_dir)/theme_resources_touch_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_200_percent.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], +} diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 596cc5a..ef275b6 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -221,53 +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', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_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', @@ -330,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)', @@ -343,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 -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))' @@ -369,6 +347,36 @@ }, ], }], + ['enable_hidpi == 1 or chromeos == 1', { + '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 and enable_touch_ui==1', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_200_percent.pak', + ], + }, + ], + }], ], # conditions }], # end OS != "mac" ], # conditions diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 5982683..a27df61 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -13,8 +13,7 @@ nacl_irt_x86_32.nexe: %(VersionDir)s\ nacl_irt_x86_64.nexe: %(VersionDir)s\ icudt.dll: %(VersionDir)s\ resources.pak: %(VersionDir)s\ -theme_resources_100_percent.pak: %(VersionDir)s\ -ui_resources_100_percent.pak: %(VersionDir)s\ +chrome_100_percent.pak: %(VersionDir)s\ locales\*.pak: %(VersionDir)s\Locales locales\*.dll: %(VersionDir)s\Locales npchrome_frame.dll: %(VersionDir)s\ @@ -33,12 +32,10 @@ default_apps\*.crx: %(VersionDir)s\default_apps\ default_apps\external_extensions.json: %(VersionDir)s\default_apps\ [HIDPI] -theme_resources_200_percent.pak: %(VersionDir)s\ -ui_resources_200_percent.pak: %(VersionDir)s\ -webkit_resources_200_percent.pak: %(VersionDir)s\ +chrome_200_percent.pak: %(VersionDir)s\ [TOUCH] -theme_resources_touch_100_percent.pak: %(VersionDir)s\ +chrome_touch_100_percent.pak: %(VersionDir)s\ [GOOGLE_CHROME] FlashPlayerApp.exe: %(VersionDir)s\ diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg index 12af170..128bd2e 100644 --- a/chrome/tools/build/chromeos/FILES.cfg +++ b/chrome/tools/build/chromeos/FILES.cfg @@ -40,6 +40,11 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'chrome_100_percent.pak', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'chrome_sandbox', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], @@ -85,16 +90,6 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { - 'filename': 'theme_resources_100_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { - 'filename': 'ui_resources_100_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { 'filename': 'session', 'arch': ['32bit', '64bit'], 'buildtype': ['dev'], diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg index 24e25f9..d0c39ed 100644 --- a/chrome/tools/build/linux/FILES.cfg +++ b/chrome/tools/build/linux/FILES.cfg @@ -42,6 +42,11 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'chrome_100_percent.pak', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'chrome_sandbox', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], @@ -87,16 +92,6 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { - 'filename': 'theme_resources_100_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { - 'filename': 'ui_resources_100_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { 'filename': 'session', 'arch': ['32bit', '64bit'], 'buildtype': ['dev'], diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index f4663af..9e03768 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -70,6 +70,23 @@ FILES = [ 'filegroup': ['default', 'symsrc'], }, { + 'filename': 'chrome_100_percent.pak', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'chrome_200_percent.pak', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + 'optional': ['dev', 'official'], + }, + { + 'filename': 'chrome_touch_100_percent.pak', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + 'optional': ['dev', 'official'], + }, + { 'filename': 'crash_service.exe', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], @@ -351,40 +368,6 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { - 'filename': 'theme_resources_100_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { - 'filename': 'theme_resources_200_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - 'optional': ['dev', 'official'], - }, - { - 'filename': 'theme_resources_touch_100_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - 'optional': ['dev', 'official'], - }, - { - 'filename': 'ui_resources_100_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { - 'filename': 'ui_resources_200_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - 'optional': ['dev', 'official'], - }, - { - 'filename': 'webkit_resources_200_percent.pak', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - 'optional': ['dev', 'official'], - }, - { 'filename': 'wow_helper.exe', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], |