diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 07:49:49 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 07:49:49 +0000 |
| commit | f6d7f8b89f745b24de46dacf5c7cbced535ac179 (patch) | |
| tree | e0c6f87bd814335c7cd134a79703dd9afc56dc89 /chrome/chrome_repack_resources.gypi | |
| parent | 3fb8b90a5007e3e4b377d851369d60f3deb2f4ef (diff) | |
| download | chromium_src-f6d7f8b89f745b24de46dacf5c7cbced535ac179.zip chromium_src-f6d7f8b89f745b24de46dacf5c7cbced535ac179.tar.gz chromium_src-f6d7f8b89f745b24de46dacf5c7cbced535ac179.tar.bz2 | |
Revert 216822 "Remove chrome.pak references, build resources int..."
Broke a variety of Linux, CrOS, and Android bots:
ninja: error: 'gen/repack/chrome.pak', needed by 'chrome.pak', missing and no
known rule to make it
> Remove chrome.pak references, build resources into resources.pak
>
> This puts resources that used to be in chrome.pak and/or compiled in to
> chrome.dll into resources.pak. resources.pak is already loaded at startup
> on all platforms so having some resources in a separate pak file isn't
> beneficial.
>
> R=tony
> TBR=sky
>
> BUG=52609
>
> Review URL: https://chromiumcodereview.appspot.com/22339020
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/22557005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_resources.gypi')
| -rw-r--r-- | chrome/chrome_repack_resources.gypi | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 7480c2d..8519aab 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -5,26 +5,14 @@ 'action_name': 'repack_resources', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', - '<(grit_out_dir)/browser_resources.pak', - '<(grit_out_dir)/common_resources.pak', '<(grit_out_dir)/memory_internals_resources.pak', '<(grit_out_dir)/net_internals_resources.pak', '<(grit_out_dir)/signin_internals_resources.pak', '<(grit_out_dir)/sync_internals_resources.pak', '<(grit_out_dir)/translate_internals_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', ], 'conditions': [ - ['OS != "ios"', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', - '<(grit_out_dir)/devtools_discovery_page_resources.pak', - ], - }], ['OS != "ios" and OS != "android"', { # New paks should be added here by default. 'pak_inputs': [ @@ -35,9 +23,9 @@ '<(grit_out_dir)/sync_file_system_internals_resources.pak', ], }], - ['enable_extensions==1', { + ['OS != "ios"', { 'pak_inputs': [ - '<(grit_out_dir)/extensions_api_resources.pak', + '<(grit_out_dir)/devtools_discovery_page_resources.pak', ], }], ], |