| OLD | NEW |
| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 | 8 |
| 9 'variables': { | 9 'variables': { |
| 10 'version_py_path': '../tools/build/version.py', | 10 'version_py_path': '../tools/build/version.py', |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 }, | 377 }, |
| 378 | 378 |
| 379 { | 379 { |
| 380 'target_name': 'chrome_frame_net_tests', | 380 'target_name': 'chrome_frame_net_tests', |
| 381 'type': 'executable', | 381 'type': 'executable', |
| 382 'dependencies': [ | 382 'dependencies': [ |
| 383 '../base/base.gyp:test_support_base', | 383 '../base/base.gyp:test_support_base', |
| 384 '../chrome/chrome.gyp:browser', | 384 '../chrome/chrome.gyp:browser', |
| 385 '../chrome/chrome.gyp:debugger', | 385 '../chrome/chrome.gyp:debugger', |
| 386 '../chrome/chrome.gyp:renderer', | 386 '../chrome/chrome.gyp:renderer', |
| 387 '../chrome/chrome.gyp:syncapi_core', | |
| 388 '../chrome/chrome.gyp:test_support_common', | 387 '../chrome/chrome.gyp:test_support_common', |
| 389 '../chrome/chrome_resources.gyp:chrome_resources', | 388 '../chrome/chrome_resources.gyp:chrome_resources', |
| 390 '../content/content.gyp:content_app', | 389 '../content/content.gyp:content_app', |
| 391 '../content/content.gyp:content_gpu', | 390 '../content/content.gyp:content_gpu', |
| 392 '../content/content.gyp:test_support_content', | 391 '../content/content.gyp:test_support_content', |
| 393 '../net/net.gyp:net', | 392 '../net/net.gyp:net', |
| 394 '../net/net.gyp:net_test_support', | 393 '../net/net.gyp:net_test_support', |
| 395 '../skia/skia.gyp:skia', | 394 '../skia/skia.gyp:skia', |
| 395 '../sync/sync.gyp:syncapi_core', |
| 396 '../testing/gtest.gyp:gtest', | 396 '../testing/gtest.gyp:gtest', |
| 397 '../third_party/icu/icu.gyp:icui18n', | 397 '../third_party/icu/icu.gyp:icui18n', |
| 398 '../third_party/icu/icu.gyp:icuuc', | 398 '../third_party/icu/icu.gyp:icuuc', |
| 399 '../ui/ui.gyp:ui_resources', | 399 '../ui/ui.gyp:ui_resources', |
| 400 'chrome_frame_ie', | 400 'chrome_frame_ie', |
| 401 'chrome_tab_idl', | 401 'chrome_tab_idl', |
| 402 'npchrome_frame', | 402 'npchrome_frame', |
| 403 ], | 403 ], |
| 404 'include_dirs': [ | 404 'include_dirs': [ |
| 405 '<(DEPTH)/breakpad/src', | 405 '<(DEPTH)/breakpad/src', |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 ['OS=="win"', { | 767 ['OS=="win"', { |
| 768 # NOTE(slightlyoff): | 768 # NOTE(slightlyoff): |
| 769 # this is a fix for the include dirs length limit on the resource | 769 # this is a fix for the include dirs length limit on the resource |
| 770 # compiler, tickled by the xul_include_dirs variable | 770 # compiler, tickled by the xul_include_dirs variable |
| 771 'resource_include_dirs': [ | 771 'resource_include_dirs': [ |
| 772 '<(INTERMEDIATE_DIR)' | 772 '<(INTERMEDIATE_DIR)' |
| 773 ], | 773 ], |
| 774 'dependencies': [ | 774 'dependencies': [ |
| 775 '../breakpad/breakpad.gyp:breakpad_handler', | 775 '../breakpad/breakpad.gyp:breakpad_handler', |
| 776 '../chrome/chrome.gyp:automation', | 776 '../chrome/chrome.gyp:automation', |
| 777 # Make the archive build happy. | |
| 778 '../chrome/chrome.gyp:syncapi_core', | |
| 779 # Installer | 777 # Installer |
| 780 '../chrome/chrome.gyp:installer_util', | 778 '../chrome/chrome.gyp:installer_util', |
| 781 '../google_update/google_update.gyp:google_update', | 779 '../google_update/google_update.gyp:google_update', |
| 780 # Make the archive build happy. |
| 781 '../sync/sync.gyp:syncapi_core', |
| 782 # Crash Reporting | 782 # Crash Reporting |
| 783 'crash_reporting/crash_reporting.gyp:crash_report', | 783 'crash_reporting/crash_reporting.gyp:crash_report', |
| 784 ], | 784 ], |
| 785 'link_settings': { | 785 'link_settings': { |
| 786 'libraries': ['-lurlmon.lib'], | 786 'libraries': ['-lurlmon.lib'], |
| 787 }, | 787 }, |
| 788 },], | 788 },], |
| 789 ], | 789 ], |
| 790 'rules': [ | 790 'rules': [ |
| 791 { | 791 { |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 # compiler, tickled by the xul_include_dirs variable | 886 # compiler, tickled by the xul_include_dirs variable |
| 887 'resource_include_dirs': [ | 887 'resource_include_dirs': [ |
| 888 '<(INTERMEDIATE_DIR)' | 888 '<(INTERMEDIATE_DIR)' |
| 889 ], | 889 ], |
| 890 'sources': [ | 890 'sources': [ |
| 891 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc', | 891 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc', |
| 892 ], | 892 ], |
| 893 'dependencies': [ | 893 'dependencies': [ |
| 894 '../breakpad/breakpad.gyp:breakpad_handler_dll', | 894 '../breakpad/breakpad.gyp:breakpad_handler_dll', |
| 895 '../chrome/chrome.gyp:automation', | 895 '../chrome/chrome.gyp:automation', |
| 896 # Make the archive build happy. | |
| 897 '../chrome/chrome.gyp:syncapi_core', | |
| 898 # Installer | 896 # Installer |
| 899 '../chrome/chrome.gyp:installer_util', | 897 '../chrome/chrome.gyp:installer_util', |
| 900 '../google_update/google_update.gyp:google_update', | 898 '../google_update/google_update.gyp:google_update', |
| 899 # Make the archive build happy. |
| 900 '../sync/sync.gyp:syncapi_core', |
| 901 # Crash Reporting | 901 # Crash Reporting |
| 902 'crash_reporting/crash_reporting.gyp:crash_report', | 902 'crash_reporting/crash_reporting.gyp:crash_report', |
| 903 ], | 903 ], |
| 904 'link_settings': { | 904 'link_settings': { |
| 905 'libraries': [ | 905 'libraries': [ |
| 906 '-lshdocvw.lib', | 906 '-lshdocvw.lib', |
| 907 ], | 907 ], |
| 908 }, | 908 }, |
| 909 'msvs_settings': { | 909 'msvs_settings': { |
| 910 'VCLinkerTool': { | 910 'VCLinkerTool': { |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1053 # Use outputs of this action as inputs for the main target build. | 1053 # Use outputs of this action as inputs for the main target build. |
| 1054 # Seems as a misnomer but makes this happy on Linux (scons). | 1054 # Seems as a misnomer but makes this happy on Linux (scons). |
| 1055 'process_outputs_as_sources': 1, | 1055 'process_outputs_as_sources': 1, |
| 1056 }, | 1056 }, |
| 1057 ], | 1057 ], |
| 1058 }, | 1058 }, |
| 1059 ], | 1059 ], |
| 1060 }, ], # 'coverage!=0' | 1060 }, ], # 'coverage!=0' |
| 1061 ], # 'conditions' | 1061 ], # 'conditions' |
| 1062 } | 1062 } |
| OLD | NEW |