| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'pyautolib_sources': [ | 6 'pyautolib_sources': [ |
| 7 'app/chrome_command_ids.h', | 7 'app/chrome_command_ids.h', |
| 8 'app/chrome_dll_resource.h', | 8 'app/chrome_dll_resource.h', |
| 9 'common/automation_constants.h', | 9 'common/automation_constants.h', |
| 10 'common/pref_names.cc', | 10 'common/pref_names.cc', |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 'debugger', | 146 'debugger', |
| 147 'renderer', | 147 'renderer', |
| 148 'test_support_common', | 148 'test_support_common', |
| 149 # NOTE: don't add test_support_ui, no more UITests. See | 149 # NOTE: don't add test_support_ui, no more UITests. See |
| 150 # http://crbug.com/137365 | 150 # http://crbug.com/137365 |
| 151 '../third_party/hunspell/hunspell.gyp:hunspell', | 151 '../third_party/hunspell/hunspell.gyp:hunspell', |
| 152 '../net/net.gyp:net', | 152 '../net/net.gyp:net', |
| 153 '../net/net.gyp:net_resources', | 153 '../net/net.gyp:net_resources', |
| 154 '../net/net.gyp:net_test_support', | 154 '../net/net.gyp:net_test_support', |
| 155 '../skia/skia.gyp:skia', | 155 '../skia/skia.gyp:skia', |
| 156 '../sync/protocol/sync_proto.gyp:sync_proto', | 156 '../sync/sync.gyp:sync', |
| 157 '../sync/sync.gyp:sync_api', | |
| 158 '../third_party/icu/icu.gyp:icui18n', | 157 '../third_party/icu/icu.gyp:icui18n', |
| 159 '../third_party/icu/icu.gyp:icuuc', | 158 '../third_party/icu/icu.gyp:icuuc', |
| 160 '../third_party/libpng/libpng.gyp:libpng', | 159 '../third_party/libpng/libpng.gyp:libpng', |
| 161 '../third_party/zlib/zlib.gyp:zlib', | 160 '../third_party/zlib/zlib.gyp:zlib', |
| 162 '../testing/gmock.gyp:gmock', | 161 '../testing/gmock.gyp:gmock', |
| 163 '../testing/gtest.gyp:gtest', | 162 '../testing/gtest.gyp:gtest', |
| 164 '../third_party/npapi/npapi.gyp:npapi', | 163 '../third_party/npapi/npapi.gyp:npapi', |
| 165 # Runtime dependencies | 164 # Runtime dependencies |
| 166 '../ppapi/ppapi_internal.gyp:ppapi_tests', | 165 '../ppapi/ppapi_internal.gyp:ppapi_tests', |
| 167 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', | 166 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 'chrome', | 454 'chrome', |
| 456 'chrome_resources.gyp:chrome_resources', | 455 'chrome_resources.gyp:chrome_resources', |
| 457 'chrome_resources.gyp:chrome_strings', | 456 'chrome_resources.gyp:chrome_strings', |
| 458 'chromedriver_support', | 457 'chromedriver_support', |
| 459 'common', | 458 'common', |
| 460 'test_support_ui', | 459 'test_support_ui', |
| 461 '../base/base.gyp:base', | 460 '../base/base.gyp:base', |
| 462 '../build/temp_gyp/googleurl.gyp:googleurl', | 461 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 463 '../net/net.gyp:net', | 462 '../net/net.gyp:net', |
| 464 '../skia/skia.gyp:skia', | 463 '../skia/skia.gyp:skia', |
| 465 '../sync/sync.gyp:sync_api', | 464 '../sync/sync.gyp:sync', |
| 466 '../testing/gtest.gyp:gtest', | 465 '../testing/gtest.gyp:gtest', |
| 467 '../third_party/icu/icu.gyp:icui18n', | 466 '../third_party/icu/icu.gyp:icui18n', |
| 468 '../third_party/icu/icu.gyp:icuuc', | 467 '../third_party/icu/icu.gyp:icuuc', |
| 469 '../third_party/libxml/libxml.gyp:libxml', | 468 '../third_party/libxml/libxml.gyp:libxml', |
| 470 ], | 469 ], |
| 471 'include_dirs': [ | 470 'include_dirs': [ |
| 472 '..', | 471 '..', |
| 473 ], | 472 ], |
| 474 'sources': [ | 473 'sources': [ |
| 475 'test/webdriver/commands/alert_commands.cc', | 474 'test/webdriver/commands/alert_commands.cc', |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 897 'common/extensions/api/api.gyp:api', | 896 'common/extensions/api/api.gyp:api', |
| 898 'renderer', | 897 'renderer', |
| 899 'test_support_common', | 898 'test_support_common', |
| 900 '../base/base.gyp:base', | 899 '../base/base.gyp:base', |
| 901 '../base/base.gyp:base_i18n', | 900 '../base/base.gyp:base_i18n', |
| 902 '../base/base.gyp:test_support_base', | 901 '../base/base.gyp:test_support_base', |
| 903 '../device/device.gyp:device_bluetooth_mocks', | 902 '../device/device.gyp:device_bluetooth_mocks', |
| 904 '../net/net.gyp:net', | 903 '../net/net.gyp:net', |
| 905 '../net/net.gyp:net_test_support', | 904 '../net/net.gyp:net_test_support', |
| 906 '../skia/skia.gyp:skia', | 905 '../skia/skia.gyp:skia', |
| 907 '../sync/protocol/sync_proto.gyp:sync_proto', | 906 '../sync/sync.gyp:sync', |
| 908 '../sync/sync.gyp:sync_notifier', | |
| 909 '../sync/sync.gyp:test_support_sync_api', | 907 '../sync/sync.gyp:test_support_sync_api', |
| 910 '../testing/gmock.gyp:gmock', | 908 '../testing/gmock.gyp:gmock', |
| 911 '../testing/gtest.gyp:gtest', | 909 '../testing/gtest.gyp:gtest', |
| 910 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
n', |
| 912 '../third_party/cld/cld.gyp:cld', | 911 '../third_party/cld/cld.gyp:cld', |
| 913 '../third_party/icu/icu.gyp:icui18n', | 912 '../third_party/icu/icu.gyp:icui18n', |
| 914 '../third_party/icu/icu.gyp:icuuc', | 913 '../third_party/icu/icu.gyp:icuuc', |
| 915 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 914 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
| 916 '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', | 915 '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', |
| 917 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', | 916 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', |
| 918 '../v8/tools/gyp/v8.gyp:v8', | 917 '../v8/tools/gyp/v8.gyp:v8', |
| 919 '../webkit/webkit.gyp:test_shell_test_support', | 918 '../webkit/webkit.gyp:test_shell_test_support', |
| 920 # Runtime dependencies | 919 # Runtime dependencies |
| 921 '../ppapi/ppapi_internal.gyp:ppapi_tests', | 920 '../ppapi/ppapi_internal.gyp:ppapi_tests', |
| (...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1722 ], # conditions | 1721 ], # conditions |
| 1723 }, # target browser_tests | 1722 }, # target browser_tests |
| 1724 { | 1723 { |
| 1725 # Executable that runs each perf browser test in a new process. | 1724 # Executable that runs each perf browser test in a new process. |
| 1726 'target_name': 'performance_browser_tests', | 1725 'target_name': 'performance_browser_tests', |
| 1727 'type': 'executable', | 1726 'type': 'executable', |
| 1728 'msvs_cygwin_shell': 0, | 1727 'msvs_cygwin_shell': 0, |
| 1729 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], | 1728 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |
| 1730 'dependencies': [ | 1729 'dependencies': [ |
| 1731 'browser', | 1730 'browser', |
| 1732 '../sync/protocol/sync_proto.gyp:sync_proto', | |
| 1733 'chrome_resources.gyp:chrome_resources', | 1731 'chrome_resources.gyp:chrome_resources', |
| 1734 'chrome_resources.gyp:chrome_strings', | 1732 'chrome_resources.gyp:chrome_strings', |
| 1735 'chrome_resources.gyp:packed_extra_resources', | 1733 'chrome_resources.gyp:packed_extra_resources', |
| 1736 'chrome_resources.gyp:packed_resources', | 1734 'chrome_resources.gyp:packed_resources', |
| 1737 'renderer', | 1735 'renderer', |
| 1738 'test_support_common', | 1736 'test_support_common', |
| 1739 '../base/base.gyp:base', | 1737 '../base/base.gyp:base', |
| 1740 '../base/base.gyp:base_i18n', | 1738 '../base/base.gyp:base_i18n', |
| 1741 '../base/base.gyp:test_support_base', | 1739 '../base/base.gyp:test_support_base', |
| 1742 '../net/net.gyp:net', | 1740 '../net/net.gyp:net', |
| 1743 '../net/net.gyp:net_test_support', | 1741 '../net/net.gyp:net_test_support', |
| 1744 '../skia/skia.gyp:skia', | 1742 '../skia/skia.gyp:skia', |
| 1743 '../sync/sync.gyp:sync', |
| 1745 '../testing/gmock.gyp:gmock', | 1744 '../testing/gmock.gyp:gmock', |
| 1746 '../testing/gtest.gyp:gtest', | 1745 '../testing/gtest.gyp:gtest', |
| 1747 '../third_party/cld/cld.gyp:cld', | 1746 '../third_party/cld/cld.gyp:cld', |
| 1748 '../third_party/icu/icu.gyp:icui18n', | 1747 '../third_party/icu/icu.gyp:icui18n', |
| 1749 '../third_party/icu/icu.gyp:icuuc', | 1748 '../third_party/icu/icu.gyp:icuuc', |
| 1750 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 1749 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
| 1751 '../v8/tools/gyp/v8.gyp:v8', | 1750 '../v8/tools/gyp/v8.gyp:v8', |
| 1752 # Runtime dependencies | 1751 # Runtime dependencies |
| 1753 '../third_party/mesa/mesa.gyp:osmesa', | 1752 '../third_party/mesa/mesa.gyp:osmesa', |
| 1754 ], | 1753 ], |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2024 '../ui/views/views.gyp:views', | 2023 '../ui/views/views.gyp:views', |
| 2025 ], | 2024 ], |
| 2026 }], | 2025 }], |
| 2027 ], | 2026 ], |
| 2028 }, | 2027 }, |
| 2029 { | 2028 { |
| 2030 'target_name': 'sync_integration_tests', | 2029 'target_name': 'sync_integration_tests', |
| 2031 'type': 'executable', | 2030 'type': 'executable', |
| 2032 'dependencies': [ | 2031 'dependencies': [ |
| 2033 'browser', | 2032 'browser', |
| 2034 '../sync/protocol/sync_proto.gyp:sync_proto', | |
| 2035 'chrome', | 2033 'chrome', |
| 2036 'chrome_resources.gyp:chrome_resources', | 2034 'chrome_resources.gyp:chrome_resources', |
| 2037 'chrome_resources.gyp:chrome_strings', | 2035 'chrome_resources.gyp:chrome_strings', |
| 2038 'chrome_resources.gyp:packed_extra_resources', | 2036 'chrome_resources.gyp:packed_extra_resources', |
| 2039 'chrome_resources.gyp:packed_resources', | 2037 'chrome_resources.gyp:packed_resources', |
| 2040 'common', | 2038 'common', |
| 2041 'common/extensions/api/api.gyp:api', | 2039 'common/extensions/api/api.gyp:api', |
| 2042 'renderer', | 2040 'renderer', |
| 2043 'test_support_common', | 2041 'test_support_common', |
| 2044 '../net/net.gyp:net', | 2042 '../net/net.gyp:net', |
| 2045 '../printing/printing.gyp:printing', | 2043 '../printing/printing.gyp:printing', |
| 2046 '../skia/skia.gyp:skia', | 2044 '../skia/skia.gyp:skia', |
| 2047 '../sync/sync.gyp:sync_notifier', | 2045 '../sync/sync.gyp:sync', |
| 2048 '../sync/sync.gyp:test_support_sync_testserver', | 2046 '../sync/sync.gyp:test_support_sync_testserver', |
| 2049 '../testing/gmock.gyp:gmock', | 2047 '../testing/gmock.gyp:gmock', |
| 2050 '../testing/gtest.gyp:gtest', | 2048 '../testing/gtest.gyp:gtest', |
| 2051 '../third_party/icu/icu.gyp:icui18n', | 2049 '../third_party/icu/icu.gyp:icui18n', |
| 2052 '../third_party/icu/icu.gyp:icuuc', | 2050 '../third_party/icu/icu.gyp:icuuc', |
| 2053 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 2051 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
| 2054 '../third_party/npapi/npapi.gyp:npapi', | 2052 '../third_party/npapi/npapi.gyp:npapi', |
| 2055 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 2053 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
| 2056 ], | 2054 ], |
| 2057 'include_dirs': [ | 2055 'include_dirs': [ |
| 2058 '..', | 2056 '..', |
| 2059 '<(INTERMEDIATE_DIR)', | 2057 '<(INTERMEDIATE_DIR)', |
| 2060 '<(protoc_out_dir)', | 2058 '<(protoc_out_dir)', |
| 2061 ], | 2059 ], |
| 2062 # TODO(phajdan.jr): Only temporary, to make transition easier. | 2060 # TODO(phajdan.jr): Only temporary, to make transition easier. |
| 2063 'defines': [ | 2061 'defines': [ |
| 2064 'HAS_OUT_OF_PROC_TEST_RUNNER', | 2062 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 2065 ], | 2063 ], |
| 2066 'sources': [ | 2064 'sources': [ |
| 2067 'app/chrome_command_ids.h', | 2065 'app/chrome_command_ids.h', |
| 2068 'app/chrome_dll.rc', | 2066 'app/chrome_dll.rc', |
| 2069 'app/chrome_dll_resource.h', | 2067 'app/chrome_dll_resource.h', |
| 2070 'app/chrome_version.rc.version', | 2068 'app/chrome_version.rc.version', |
| 2071 'browser/sessions/session_backend.cc', | |
| 2072 'browser/sync/glue/session_model_associator.cc', | |
| 2073 'test/base/chrome_test_launcher.cc', | 2069 'test/base/chrome_test_launcher.cc', |
| 2074 'test/data/resource.rc', | 2070 'test/data/resource.rc', |
| 2075 'browser/sync/test/integration/apps_helper.cc', | 2071 'browser/sync/test/integration/apps_helper.cc', |
| 2076 'browser/sync/test/integration/apps_helper.h', | 2072 'browser/sync/test/integration/apps_helper.h', |
| 2077 'browser/sync/test/integration/autofill_helper.cc', | 2073 'browser/sync/test/integration/autofill_helper.cc', |
| 2078 'browser/sync/test/integration/autofill_helper.h', | 2074 'browser/sync/test/integration/autofill_helper.h', |
| 2079 'browser/sync/test/integration/bookmarks_helper.cc', | 2075 'browser/sync/test/integration/bookmarks_helper.cc', |
| 2080 'browser/sync/test/integration/bookmarks_helper.h', | 2076 'browser/sync/test/integration/bookmarks_helper.h', |
| 2081 'browser/sync/test/integration/cross_platform_sync_test.cc', | 2077 'browser/sync/test/integration/cross_platform_sync_test.cc', |
| 2082 'browser/sync/test/integration/dictionary_helper.cc', | 2078 'browser/sync/test/integration/dictionary_helper.cc', |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2200 'dependencies': [ | 2196 'dependencies': [ |
| 2201 '../ui/views/views.gyp:views', | 2197 '../ui/views/views.gyp:views', |
| 2202 ], | 2198 ], |
| 2203 }], | 2199 }], |
| 2204 ], | 2200 ], |
| 2205 }, | 2201 }, |
| 2206 { | 2202 { |
| 2207 'target_name': 'sync_performance_tests', | 2203 'target_name': 'sync_performance_tests', |
| 2208 'type': 'executable', | 2204 'type': 'executable', |
| 2209 'dependencies': [ | 2205 'dependencies': [ |
| 2210 '../sync/protocol/sync_proto.gyp:sync_proto', | |
| 2211 'browser', | 2206 'browser', |
| 2212 'chrome', | 2207 'chrome', |
| 2213 'common/extensions/api/api.gyp:api', | 2208 'common/extensions/api/api.gyp:api', |
| 2214 'test_support_common', | 2209 'test_support_common', |
| 2215 '../skia/skia.gyp:skia', | 2210 '../skia/skia.gyp:skia', |
| 2216 '../sync/sync.gyp:sync_notifier', | 2211 '../sync/sync.gyp:sync', |
| 2217 '../sync/sync.gyp:test_support_sync_testserver', | 2212 '../sync/sync.gyp:test_support_sync_testserver', |
| 2218 '../testing/gmock.gyp:gmock', | 2213 '../testing/gmock.gyp:gmock', |
| 2219 '../testing/gtest.gyp:gtest', | 2214 '../testing/gtest.gyp:gtest', |
| 2220 ], | 2215 ], |
| 2221 'include_dirs': [ | 2216 'include_dirs': [ |
| 2222 '..', | 2217 '..', |
| 2223 '<(INTERMEDIATE_DIR)', | 2218 '<(INTERMEDIATE_DIR)', |
| 2224 '<(protoc_out_dir)', | 2219 '<(protoc_out_dir)', |
| 2225 ], | 2220 ], |
| 2226 'defines': [ | 2221 'defines': [ |
| 2227 'HAS_OUT_OF_PROC_TEST_RUNNER', | 2222 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 2228 ], | 2223 ], |
| 2229 'sources': [ | 2224 'sources': [ |
| 2230 'app/chrome_command_ids.h', | 2225 'app/chrome_command_ids.h', |
| 2231 'app/chrome_dll.rc', | 2226 'app/chrome_dll.rc', |
| 2232 'app/chrome_dll_resource.h', | 2227 'app/chrome_dll_resource.h', |
| 2233 'app/chrome_version.rc.version', | 2228 'app/chrome_version.rc.version', |
| 2234 'browser/sessions/session_backend.cc', | |
| 2235 'browser/sync/glue/session_model_associator.cc', | |
| 2236 'browser/sync/test/integration/autofill_helper.cc', | 2229 'browser/sync/test/integration/autofill_helper.cc', |
| 2237 'browser/sync/test/integration/autofill_helper.h', | 2230 'browser/sync/test/integration/autofill_helper.h', |
| 2238 'browser/sync/test/integration/bookmarks_helper.cc', | 2231 'browser/sync/test/integration/bookmarks_helper.cc', |
| 2239 'browser/sync/test/integration/bookmarks_helper.h', | 2232 'browser/sync/test/integration/bookmarks_helper.h', |
| 2240 'browser/sync/test/integration/dictionary_helper.cc', | 2233 'browser/sync/test/integration/dictionary_helper.cc', |
| 2241 'browser/sync/test/integration/dictionary_helper.h', | 2234 'browser/sync/test/integration/dictionary_helper.h', |
| 2242 'browser/sync/test/integration/dictionary_load_observer.cc', | 2235 'browser/sync/test/integration/dictionary_load_observer.cc', |
| 2243 'browser/sync/test/integration/dictionary_load_observer.h', | 2236 'browser/sync/test/integration/dictionary_load_observer.h', |
| 2244 'browser/sync/test/integration/extensions_helper.cc', | 2237 'browser/sync/test/integration/extensions_helper.cc', |
| 2245 'browser/sync/test/integration/extensions_helper.h', | 2238 'browser/sync/test/integration/extensions_helper.h', |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2511 ], # OS=="win" | 2504 ], # OS=="win" |
| 2512 ['OS=="linux" or OS=="win"', { | 2505 ['OS=="linux" or OS=="win"', { |
| 2513 'targets': [ | 2506 'targets': [ |
| 2514 { | 2507 { |
| 2515 'target_name': 'generate_profile', | 2508 'target_name': 'generate_profile', |
| 2516 'type': 'executable', | 2509 'type': 'executable', |
| 2517 'dependencies': [ | 2510 'dependencies': [ |
| 2518 'test_support_common', | 2511 'test_support_common', |
| 2519 'browser', | 2512 'browser', |
| 2520 'renderer', | 2513 'renderer', |
| 2521 » 'chrome_resources.gyp:packed_resources', | 2514 'chrome_resources.gyp:packed_resources', |
| 2522 '../base/base.gyp:base', | 2515 '../base/base.gyp:base', |
| 2523 '../net/net.gyp:net_test_support', | 2516 '../net/net.gyp:net_test_support', |
| 2524 '../skia/skia.gyp:skia', | 2517 '../skia/skia.gyp:skia', |
| 2525 '../sync/sync.gyp:sync_api', | 2518 '../sync/sync.gyp:sync', |
| 2526 ], | 2519 ], |
| 2527 'include_dirs': [ | 2520 'include_dirs': [ |
| 2528 '..', | 2521 '..', |
| 2529 ], | 2522 ], |
| 2530 'sources': [ | 2523 'sources': [ |
| 2531 'tools/profiles/generate_profile.cc', | 2524 'tools/profiles/generate_profile.cc', |
| 2532 'tools/profiles/thumbnail-inl.h', | 2525 'tools/profiles/thumbnail-inl.h', |
| 2533 ], | 2526 ], |
| 2534 'conditions': [ | 2527 'conditions': [ |
| 2535 ['OS=="win"', { | 2528 ['OS=="win"', { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 2564 'type': 'loadable_module', | 2557 'type': 'loadable_module', |
| 2565 'product_prefix': '_', | 2558 'product_prefix': '_', |
| 2566 'dependencies': [ | 2559 'dependencies': [ |
| 2567 'chrome', | 2560 'chrome', |
| 2568 'chrome_resources.gyp:chrome_resources', | 2561 'chrome_resources.gyp:chrome_resources', |
| 2569 'chrome_resources.gyp:chrome_strings', | 2562 'chrome_resources.gyp:chrome_strings', |
| 2570 'chrome_resources.gyp:theme_resources', | 2563 'chrome_resources.gyp:theme_resources', |
| 2571 'debugger', | 2564 'debugger', |
| 2572 'test_support_common', | 2565 'test_support_common', |
| 2573 '../skia/skia.gyp:skia', | 2566 '../skia/skia.gyp:skia', |
| 2574 '../sync/sync.gyp:sync_api', | 2567 '../sync/sync.gyp:sync', |
| 2575 '../testing/gtest.gyp:gtest', | 2568 '../testing/gtest.gyp:gtest', |
| 2576 ], | 2569 ], |
| 2577 'export_dependent_settings': [ | 2570 'export_dependent_settings': [ |
| 2578 'test_support_common', | 2571 'test_support_common', |
| 2579 ], | 2572 ], |
| 2580 'include_dirs': [ | 2573 'include_dirs': [ |
| 2581 '..', | 2574 '..', |
| 2582 ], | 2575 ], |
| 2583 'cflags': [ | 2576 'cflags': [ |
| 2584 '-Wno-uninitialized', | 2577 '-Wno-uninitialized', |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2967 'sync_integration_tests.isolate', | 2960 'sync_integration_tests.isolate', |
| 2968 ], | 2961 ], |
| 2969 'sources': [ | 2962 'sources': [ |
| 2970 'sync_integration_tests.isolate', | 2963 'sync_integration_tests.isolate', |
| 2971 ], | 2964 ], |
| 2972 }, | 2965 }, |
| 2973 ], | 2966 ], |
| 2974 }], | 2967 }], |
| 2975 ], # 'conditions' | 2968 ], # 'conditions' |
| 2976 } | 2969 } |
| OLD | NEW |