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

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: Fix try jobs 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
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 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1404 'message': 'Generating version header file: <@(_outputs)', 1433 'message': 'Generating version header file: <@(_outputs)',
1405 }, 1434 },
1406 ], 1435 ],
1407 }, 1436 },
1408 { 1437 {
1409 'target_name': 'automation', 1438 'target_name': 'automation',
1410 'type': '<(library)', 1439 'type': '<(library)',
1411 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12', 1440 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',
1412 'dependencies': [ 1441 'dependencies': [
1413 'theme_resources', 1442 'theme_resources',
1443 'theme_resources_standard',
1414 '../base/base.gyp:test_support_base', 1444 '../base/base.gyp:test_support_base',
1415 '../skia/skia.gyp:skia', 1445 '../skia/skia.gyp:skia',
1416 '../testing/gtest.gyp:gtest', 1446 '../testing/gtest.gyp:gtest',
1417 ], 1447 ],
1418 'include_dirs': [ 1448 'include_dirs': [
1419 '..', 1449 '..',
1420 ], 1450 ],
1421 'sources': [ 1451 'sources': [
1422 'test/automation/autocomplete_edit_proxy.cc', 1452 'test/automation/autocomplete_edit_proxy.cc',
1423 'test/automation/autocomplete_edit_proxy.h', 1453 'test/automation/autocomplete_edit_proxy.h',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 '<(grit_out_dir)/common_resources.pak', 1522 '<(grit_out_dir)/common_resources.pak',
1493 '<(grit_out_dir)/default_plugin_resources/default_plugin_resourc es.pak', 1523 '<(grit_out_dir)/default_plugin_resources/default_plugin_resourc es.pak',
1494 '<(grit_out_dir)/renderer_resources.pak', 1524 '<(grit_out_dir)/renderer_resources.pak',
1495 '<(grit_out_dir)/theme_resources.pak', 1525 '<(grit_out_dir)/theme_resources.pak',
1496 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak' , 1526 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak' ,
1497 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', 1527 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
1498 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 1528 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
1499 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak ', 1529 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak ',
1500 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 1530 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
1501 ], 1531 ],
1532 'conditions': [
1533 ['touchui=="0"', {
1534 'theme_resources_inputs': [
1535 '<(grit_out_dir)/theme_resources_standard.pak',
1536 ],
1537 }, { # else: touchui!="0"
1538 'theme_resources_inputs': [
1539 '<(grit_out_dir)/theme_resources_large.pak',
1540 ],
1541 }],
1542 ],
1502 }, 1543 },
1503 'inputs': [ 1544 'inputs': [
1504 '<(repack_path)', 1545 '<(repack_path)',
1505 '<@(pak_inputs)', 1546 '<@(pak_inputs)',
1547 '<@(theme_resources_inputs)',
1506 ], 1548 ],
1507 'outputs': [ 1549 'outputs': [
1508 '<(INTERMEDIATE_DIR)/repack/chrome.pak', 1550 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
1509 ], 1551 ],
1510 'action': ['python', '<(repack_path)', '<@(_outputs)', 1552 'action': ['python', '<(repack_path)', '<@(_outputs)',
1511 '<@(pak_inputs)'], 1553 '<@(pak_inputs)'],
1512 }, 1554 },
1513 { 1555 {
1514 'action_name': 'repack_locales', 1556 'action_name': 'repack_locales',
1515 'variables': { 1557 'variables': {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 }], # targets 1603 }], # targets
1562 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1604 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1563 ], # 'conditions' 1605 ], # 'conditions'
1564 } 1606 }
1565 1607
1566 # Local Variables: 1608 # Local Variables:
1567 # tab-width:2 1609 # tab-width:2
1568 # indent-tabs-mode:nil 1610 # indent-tabs-mode:nil
1569 # End: 1611 # End:
1570 # vim: set expandtab tabstop=2 shiftwidth=2: 1612 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698