diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 20:18:02 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 20:18:02 +0000 |
| commit | 406d3d55c8240b90b954d099eacfdb49e018302e (patch) | |
| tree | 1ba071aa9ab78fae7605d41ea58f8ac86dc56e0b /chrome/chrome_repack_chrome.gypi | |
| parent | e517e475a5944024fe530013ffa9575c2fea6574 (diff) | |
| download | chromium_src-406d3d55c8240b90b954d099eacfdb49e018302e.zip chromium_src-406d3d55c8240b90b954d099eacfdb49e018302e.tar.gz chromium_src-406d3d55c8240b90b954d099eacfdb49e018302e.tar.bz2 | |
Removing the last occurences of the 'touchui' gyp flag.
BUG=105046
TEST=none
Review URL: http://codereview.chromium.org/8769010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_chrome.gypi')
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index aa6a1c4..915a22a 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -10,9 +10,11 @@ '<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak', '<(grit_out_dir)/renderer_resources.pak', '<(grit_out_dir)/theme_resources.pak', + '<(grit_out_dir)/theme_resources_standard.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', ], @@ -22,17 +24,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', ] }], - ['touchui==0 or OS == "mac"', { - 'pak_inputs': [ - '<(grit_out_dir)/theme_resources_standard.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak', - ], - }, { # else: touchui!=0 - 'pak_inputs': [ - '<(grit_out_dir)/theme_resources_large.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resources_large.pak', - ], - }], ], }, 'inputs': [ |