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

Side by Side Diff: chrome/chrome.gyp

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments Created 9 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
« no previous file with comments | « chrome/browser/ui/webui/theme_source_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 'action_name': 'theme_resources', 233 'action_name': 'theme_resources',
234 'variables': { 234 'variables': {
235 'grit_grd_file': 'app/theme/theme_resources.grd', 235 'grit_grd_file': 'app/theme/theme_resources.grd',
236 }, 236 },
237 'includes': [ '../build/grit_action.gypi' ], 237 'includes': [ '../build/grit_action.gypi' ],
238 }, 238 },
239 ], 239 ],
240 'includes': [ '../build/grit_target.gypi' ], 240 'includes': [ '../build/grit_target.gypi' ],
241 }, 241 },
242 { 242 {
243 'target_name': 'theme_resources_large',
244 'type': 'none',
245 'actions': [
246 {
247 'action_name': 'theme_resources_large',
248 'variables': {
249 'grit_grd_file': 'app/theme/theme_resources_large.grd',
250 },
251 'includes': [ '../build/grit_action.gypi' ],
252 },
253 ],
254 'includes': [ '../build/grit_target.gypi' ],
255 },
256 {
257 'target_name': 'theme_resources_standard',
258 'type': 'none',
259 'actions': [
260 {
261 'action_name': 'theme_resources_standard',
262 'variables': {
263 'grit_grd_file': 'app/theme/theme_resources_standard.grd',
264 },
265 'includes': [ '../build/grit_action.gypi' ],
266 },
267 ],
268 'includes': [ '../build/grit_target.gypi' ],
269 },
270 {
243 'target_name': 'platform_locale_settings', 271 'target_name': 'platform_locale_settings',
244 'type': 'none', 272 'type': 'none',
245 'actions': [ 273 'actions': [
246 { 274 {
247 'action_name': 'platform_locale_settings', 275 'action_name': 'platform_locale_settings',
248 'variables': { 276 'variables': {
249 'grit_grd_file': '<(platform_locale_settings_grd)', 277 'grit_grd_file': '<(platform_locale_settings_grd)',
250 }, 278 },
251 'includes': [ '../build/grit_action.gypi' ], 279 'includes': [ '../build/grit_action.gypi' ],
252 }, 280 },
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 }, 376 },
349 { 377 {
350 'target_name': 'debugger', 378 'target_name': 'debugger',
351 'type': '<(library)', 379 'type': '<(library)',
352 'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6', 380 'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6',
353 'dependencies': [ 381 'dependencies': [
354 'chrome_resources', 382 'chrome_resources',
355 'chrome_strings', 383 'chrome_strings',
356 '../net/net.gyp:http_server', 384 '../net/net.gyp:http_server',
357 'theme_resources', 385 'theme_resources',
386 'theme_resources_standard',
358 '../skia/skia.gyp:skia', 387 '../skia/skia.gyp:skia',
359 '../third_party/icu/icu.gyp:icui18n', 388 '../third_party/icu/icu.gyp:icui18n',
360 '../third_party/icu/icu.gyp:icuuc', 389 '../third_party/icu/icu.gyp:icuuc',
361 ], 390 ],
362 'include_dirs': [ 391 'include_dirs': [
363 '..', 392 '..',
364 ], 393 ],
365 'sources': [ 394 'sources': [
366 'browser/debugger/browser_list_tabcontents_provider.cc', 395 'browser/debugger/browser_list_tabcontents_provider.cc',
367 'browser/debugger/browser_list_tabcontents_provider.h', 396 'browser/debugger/browser_list_tabcontents_provider.h',
(...skipping 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 'message': 'Generating version header file: <@(_outputs)', 1429 'message': 'Generating version header file: <@(_outputs)',
1401 }, 1430 },
1402 ], 1431 ],
1403 }, 1432 },
1404 { 1433 {
1405 'target_name': 'automation', 1434 'target_name': 'automation',
1406 'type': '<(library)', 1435 'type': '<(library)',
1407 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12', 1436 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',
1408 'dependencies': [ 1437 'dependencies': [
1409 'theme_resources', 1438 'theme_resources',
1439 'theme_resources_standard',
1410 '../base/base.gyp:test_support_base', 1440 '../base/base.gyp:test_support_base',
1411 '../skia/skia.gyp:skia', 1441 '../skia/skia.gyp:skia',
1412 '../testing/gtest.gyp:gtest', 1442 '../testing/gtest.gyp:gtest',
1413 ], 1443 ],
1414 'include_dirs': [ 1444 'include_dirs': [
1415 '..', 1445 '..',
1416 ], 1446 ],
1417 'sources': [ 1447 'sources': [
1418 'test/automation/autocomplete_edit_proxy.cc', 1448 'test/automation/autocomplete_edit_proxy.cc',
1419 'test/automation/autocomplete_edit_proxy.h', 1449 'test/automation/autocomplete_edit_proxy.h',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
1488 '<(grit_out_dir)/common_resources.pak', 1518 '<(grit_out_dir)/common_resources.pak',
1489 '<(grit_out_dir)/default_plugin_resources/default_plugin_resourc es.pak', 1519 '<(grit_out_dir)/default_plugin_resources/default_plugin_resourc es.pak',
1490 '<(grit_out_dir)/renderer_resources.pak', 1520 '<(grit_out_dir)/renderer_resources.pak',
1491 '<(grit_out_dir)/theme_resources.pak', 1521 '<(grit_out_dir)/theme_resources.pak',
1492 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak' , 1522 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak' ,
1493 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', 1523 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
1494 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 1524 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
1495 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak ', 1525 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak ',
1496 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 1526 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
1497 ], 1527 ],
1528 'conditions': [
1529 ['touchui==0', {
1530 'pak_inputs': [
1531 '<(grit_out_dir)/theme_resources_standard.pak',
1532 ],
1533 }, { # else: touchui!=0
1534 'pak_inputs': [
1535 '<(grit_out_dir)/theme_resources_large.pak',
1536 ],
1537 }],
1538 ],
1498 }, 1539 },
1499 'inputs': [ 1540 'inputs': [
1500 '<(repack_path)', 1541 '<(repack_path)',
1501 '<@(pak_inputs)', 1542 '<@(pak_inputs)',
1502 ], 1543 ],
1503 'outputs': [ 1544 'outputs': [
1504 '<(INTERMEDIATE_DIR)/repack/chrome.pak', 1545 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
1505 ], 1546 ],
1506 'action': ['python', '<(repack_path)', '<@(_outputs)', 1547 'action': ['python', '<(repack_path)', '<@(_outputs)',
1507 '<@(pak_inputs)'], 1548 '<@(pak_inputs)'],
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
1557 }], # targets 1598 }], # targets
1558 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1599 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1559 ], # 'conditions' 1600 ], # 'conditions'
1560 } 1601 }
1561 1602
1562 # Local Variables: 1603 # Local Variables:
1563 # tab-width:2 1604 # tab-width:2
1564 # indent-tabs-mode:nil 1605 # indent-tabs-mode:nil
1565 # End: 1606 # End:
1566 # vim: set expandtab tabstop=2 shiftwidth=2: 1607 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/theme_source_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698