Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: chrome/chrome_resources.gyp

Issue 10024050: Metro/HiDPI: Move 1x icons into separate pak file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix hidpi flag Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 }, 205 },
206 { 206 {
207 'action_name': 'theme_resources_standard', 207 'action_name': 'theme_resources_standard',
208 'variables': { 208 'variables': {
209 'grit_grd_file': 'app/theme/theme_resources_standard.grd', 209 'grit_grd_file': 'app/theme/theme_resources_standard.grd',
210 }, 210 },
211 'includes': [ '../build/grit_action.gypi' ], 211 'includes': [ '../build/grit_action.gypi' ],
212 }, 212 },
213 ], 213 ],
214 'includes': [ '../build/grit_target.gypi' ], 214 'includes': [ '../build/grit_target.gypi' ],
215 'conditions': [
216 ['OS != "mac"', {
217 # Copy pak files to the product directory. These files will be picked
218 # up by the following installer scripts:
219 # - Windows: chrome/installer/mini_installer/chrome.release
220 # - Linux: chrome/installer/linux/internal/common/installer.include
221 # Ensure that the above scripts are updated when adding or removing
222 # pak files.
223 # Coping files to the product directory is not needed on the Mac
224 # since the framework build phase will copy them into the framework
225 # bundle directly.
226 'copies': [
227 {
228 'destination': '<(PRODUCT_DIR)',
229 'files': [
230 '<(grit_out_dir)/theme_resources_standard.pak',
231 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource s_standard.pak',
232 ],
233 },
234 ],
235 }],
236 ['OS != "mac" and enable_hidpi == 1', {
237 'copies': [
238 {
239 'destination': '<(PRODUCT_DIR)',
240 'files': [
241 '<(grit_out_dir)/theme_resources_2x.pak',
242 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.p ak',
243 ],
244 },
245 ],
246 }],
247 ],
215 }, 248 },
216 { 249 {
217 'target_name': 'packed_extra_resources', 250 'target_name': 'packed_extra_resources',
218 'type': 'none', 251 'type': 'none',
219 'variables': { 252 'variables': {
220 'repack_path': '../tools/grit/grit/format/repack.py', 253 'repack_path': '../tools/grit/grit/format/repack.py',
221 }, 254 },
222 'dependencies': [ 255 'dependencies': [
223 'chrome_extra_resources', 256 'chrome_extra_resources',
224 ], 257 ],
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 'files': ['<@(default_apps_list)'] 348 'files': ['<@(default_apps_list)']
316 }, 349 },
317 ], 350 ],
318 }], 351 }],
319 ], # conditions 352 ], # conditions
320 }], # end OS != "mac" 353 }], # end OS != "mac"
321 ], # conditions 354 ], # conditions
322 }, 355 },
323 ], # targets 356 ], # targets
324 } 357 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698