| OLD | NEW | 
|---|
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 { | 5 { | 
| 6   'variables': { | 6   'variables': { | 
|  | 7     # TODO: remove this helper when we have loops in GYP | 
|  | 8     'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], | 
| 7     'feature_defines': [ | 9     'feature_defines': [ | 
| 8       'ENABLE_CHANNEL_MESSAGING=1', | 10       'ENABLE_CHANNEL_MESSAGING=1', | 
| 9       'ENABLE_DATABASE=1', | 11       'ENABLE_DATABASE=1', | 
| 10       'ENABLE_DATAGRID=0', | 12       'ENABLE_DATAGRID=0', | 
| 11       'ENABLE_OFFLINE_WEB_APPLICATIONS=1', | 13       'ENABLE_OFFLINE_WEB_APPLICATIONS=1', | 
| 12       'ENABLE_DASHBOARD_SUPPORT=0', | 14       'ENABLE_DASHBOARD_SUPPORT=0', | 
| 13       'ENABLE_DOM_STORAGE=1', | 15       'ENABLE_DOM_STORAGE=1', | 
| 14       'ENABLE_JAVASCRIPT_DEBUGGER=0', | 16       'ENABLE_JAVASCRIPT_DEBUGGER=0', | 
| 15       'ENABLE_JSC_MULTIPLE_THREADS=0', | 17       'ENABLE_JSC_MULTIPLE_THREADS=0', | 
| 16       'ENABLE_ICONDATABASE=0', | 18       'ENABLE_ICONDATABASE=0', | 
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 508           ], | 510           ], | 
| 509           'outputs': [ | 511           'outputs': [ | 
| 510             '<(INTERMEDIATE_DIR)/bindings/V8<(RULE_INPUT_ROOT).cpp', | 512             '<(INTERMEDIATE_DIR)/bindings/V8<(RULE_INPUT_ROOT).cpp', | 
| 511             '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8<(RULE_INPUT_ROOT).h', | 513             '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8<(RULE_INPUT_ROOT).h', | 
| 512           ], | 514           ], | 
| 513           'variables': { | 515           'variables': { | 
| 514             'generator_include_dirs': [ | 516             'generator_include_dirs': [ | 
| 515               '--include', '../third_party/WebKit/WebCore/css', | 517               '--include', '../third_party/WebKit/WebCore/css', | 
| 516               '--include', '../third_party/WebKit/WebCore/dom', | 518               '--include', '../third_party/WebKit/WebCore/dom', | 
| 517               '--include', '../third_party/WebKit/WebCore/html', | 519               '--include', '../third_party/WebKit/WebCore/html', | 
| 518               '--include', '../third_party/WebKit/WebCore/notifications', | 520               '--include', '../third_party/WebKit/WebCore/notifications', | 
| 519               '--include', '../third_party/WebKit/WebCore/page', | 521               '--include', '../third_party/WebKit/WebCore/page', | 
| 520               '--include', '../third_party/WebKit/WebCore/plugins', | 522               '--include', '../third_party/WebKit/WebCore/plugins', | 
| 521               '--include', '../third_party/WebKit/WebCore/svg', | 523               '--include', '../third_party/WebKit/WebCore/svg', | 
| 522               '--include', '../third_party/WebKit/WebCore/workers', | 524               '--include', '../third_party/WebKit/WebCore/workers', | 
| 523               '--include', '../third_party/WebKit/WebCore/xml', | 525               '--include', '../third_party/WebKit/WebCore/xml', | 
| 524             ], | 526             ], | 
| 525           }, | 527           }, | 
| 526           'action': ['python', 'build/rule_binding.py', '<(RULE_INPUT_PATH)', '<
      (INTERMEDIATE_DIR)/bindings', '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings', '--'
      , '<@(_inputs)', '--', '--defines', '<(feature_defines) LANGUAGE_JAVASCRIPT V8_B
      INDING', '--generator', 'V8', '<@(generator_include_dirs)'], | 528           'action': ['python', 'build/rule_binding.py', '<(RULE_INPUT_PATH)', '<
      (INTERMEDIATE_DIR)/bindings', '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings', '--'
      , '<@(_inputs)', '--', '--defines', '<(feature_defines) LANGUAGE_JAVASCRIPT V8_B
      INDING', '--generator', 'V8', '<@(generator_include_dirs)'], | 
| 527           # They are included by DerivedSourcesAllInOne.cpp instead. | 529           # They are included by DerivedSourcesAllInOne.cpp instead. | 
| 528           'process_outputs_as_sources': 0, | 530           'process_outputs_as_sources': 0, | 
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 631         '../third_party/WebKit/WebCore/svg/SVGTests.idl', | 633         '../third_party/WebKit/WebCore/svg/SVGTests.idl', | 
| 632         '../third_party/WebKit/WebCore/svg/SVGTransformable.idl', | 634         '../third_party/WebKit/WebCore/svg/SVGTransformable.idl', | 
| 633         '../third_party/WebKit/WebCore/svg/SVGViewSpec.idl', | 635         '../third_party/WebKit/WebCore/svg/SVGViewSpec.idl', | 
| 634         '../third_party/WebKit/WebCore/svg/SVGZoomAndPan.idl', | 636         '../third_party/WebKit/WebCore/svg/SVGZoomAndPan.idl', | 
| 635 | 637 | 
| 636         # TODO(mark): I don't know why these are excluded, either. | 638         # TODO(mark): I don't know why these are excluded, either. | 
| 637         # Someone (me?) should figure it out and add appropriate comments. | 639         # Someone (me?) should figure it out and add appropriate comments. | 
| 638         '../third_party/WebKit/WebCore/css/CSSUnknownRule.idl', | 640         '../third_party/WebKit/WebCore/css/CSSUnknownRule.idl', | 
| 639 | 641 | 
| 640         # A few things can't be excluded by patterns.  List them individually. | 642         # A few things can't be excluded by patterns.  List them individually. | 
| 641 | 643 | 
| 642         # Don't build StorageNamespace.  We have our own implementation. | 644         # Don't build StorageNamespace.  We have our own implementation. | 
| 643         '../third_party/WebKit/WebCore/storage/StorageNamespace.cpp', | 645         '../third_party/WebKit/WebCore/storage/StorageNamespace.cpp', | 
| 644 | 646 | 
| 645         # Use history/BackForwardListChromium.cpp instead. | 647         # Use history/BackForwardListChromium.cpp instead. | 
| 646         '../third_party/WebKit/WebCore/history/BackForwardList.cpp', | 648         '../third_party/WebKit/WebCore/history/BackForwardList.cpp', | 
| 647 | 649 | 
| 648         # Use loader/icon/IconDatabaseNone.cpp instead. | 650         # Use loader/icon/IconDatabaseNone.cpp instead. | 
| 649         '../third_party/WebKit/WebCore/loader/icon/IconDatabase.cpp', | 651         '../third_party/WebKit/WebCore/loader/icon/IconDatabase.cpp', | 
| 650 | 652 | 
| 651         # Use platform/KURLGoogle.cpp instead. | 653         # Use platform/KURLGoogle.cpp instead. | 
| 652         '../third_party/WebKit/WebCore/platform/KURL.cpp', | 654         '../third_party/WebKit/WebCore/platform/KURL.cpp', | 
| 653 | 655 | 
| 654         # Use platform/MIMETypeRegistryChromium.cpp instead. | 656         # Use platform/MIMETypeRegistryChromium.cpp instead. | 
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1181         { | 1183         { | 
| 1182           'action_name': 'webkit_strings', | 1184           'action_name': 'webkit_strings', | 
| 1183           'variables': { | 1185           'variables': { | 
| 1184             'input_path': 'glue/webkit_strings.grd', | 1186             'input_path': 'glue/webkit_strings.grd', | 
| 1185           }, | 1187           }, | 
| 1186           'inputs': [ | 1188           'inputs': [ | 
| 1187             '<(input_path)', | 1189             '<(input_path)', | 
| 1188           ], | 1190           ], | 
| 1189           'outputs': [ | 1191           'outputs': [ | 
| 1190             '<(grit_out_dir)/grit/webkit_strings.h', | 1192             '<(grit_out_dir)/grit/webkit_strings.h', | 
| 1191             # TODO(benl) Generate this list from a helper script, like | 1193             # TODO: remove this helper when we have loops in GYP | 
| 1192             # repack_locales_cmd in chrome.gyp (see TODO(mmoss)) | 1194             '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/webkit_strings_ZZLOCALE.
      pak\' <(locales))', | 
| 1193             '<(grit_out_dir)/webkit_strings_ar.pak', |  | 
| 1194             '<(grit_out_dir)/webkit_strings_da.pak', |  | 
| 1195             '<(grit_out_dir)/webkit_strings_da.rc', |  | 
| 1196             '<(grit_out_dir)/webkit_strings_en-US.pak', |  | 
| 1197             '<(grit_out_dir)/webkit_strings_en-US.rc', |  | 
| 1198             '<(grit_out_dir)/webkit_strings_he.pak', |  | 
| 1199             '<(grit_out_dir)/webkit_strings_he.rc', |  | 
| 1200             '<(grit_out_dir)/webkit_strings_zh-TW.pak', |  | 
| 1201             '<(grit_out_dir)/webkit_strings_zh-TW.rc', |  | 
| 1202           ], | 1195           ], | 
| 1203           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
      -o', '<(grit_out_dir)'], | 1196           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
      -o', '<(grit_out_dir)'], | 
| 1204           'message': 'Generating resources from <(input_path)', | 1197           'message': 'Generating resources from <(input_path)', | 
| 1205         }, | 1198         }, | 
| 1206       ], | 1199       ], | 
| 1207       'direct_dependent_settings': { | 1200       'direct_dependent_settings': { | 
| 1208         'include_dirs': [ | 1201         'include_dirs': [ | 
| 1209           '<(SHARED_INTERMEDIATE_DIR)/webkit', | 1202           '<(SHARED_INTERMEDIATE_DIR)/webkit', | 
| 1210         ], | 1203         ], | 
| 1211       }, | 1204       }, | 
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1561           'files': [ | 1554           'files': [ | 
| 1562 | 1555 | 
| 1563             '<@(webinspector_image_files)', | 1556             '<@(webinspector_image_files)', | 
| 1564 | 1557 | 
| 1565           ], | 1558           ], | 
| 1566         }, | 1559         }, | 
| 1567       ], | 1560       ], | 
| 1568     }, | 1561     }, | 
| 1569   ], # targets | 1562   ], # targets | 
| 1570 } | 1563 } | 
| OLD | NEW | 
|---|