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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 215633004: Fix chrome_api and extensions_api gyp dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 }, 81 },
82 { 82 {
83 'target_name': 'interactive_ui_tests', 83 'target_name': 'interactive_ui_tests',
84 'type': 'executable', 84 'type': 'executable',
85 'dependencies': [ 85 'dependencies': [
86 'browser', 86 'browser',
87 'chrome_resources.gyp:chrome_resources', 87 'chrome_resources.gyp:chrome_resources',
88 'chrome_resources.gyp:chrome_strings', 88 'chrome_resources.gyp:chrome_strings',
89 'chrome_resources.gyp:packed_extra_resources', 89 'chrome_resources.gyp:packed_extra_resources',
90 'chrome_resources.gyp:packed_resources', 90 'chrome_resources.gyp:packed_resources',
91 'common/extensions/api/api.gyp:chrome_api',
92 'debugger', 91 'debugger',
93 'renderer', 92 'renderer',
94 'test_support_common', 93 'test_support_common',
95 # NOTE: don't add test_support_ui, no more UITests. See 94 # NOTE: don't add test_support_ui, no more UITests. See
96 # http://crbug.com/137365 95 # http://crbug.com/137365
97 '../google_apis/google_apis.gyp:google_apis_test_support', 96 '../google_apis/google_apis.gyp:google_apis_test_support',
98 '../third_party/hunspell/hunspell.gyp:hunspell', 97 '../third_party/hunspell/hunspell.gyp:hunspell',
99 '../net/net.gyp:net', 98 '../net/net.gyp:net',
100 '../net/net.gyp:net_resources', 99 '../net/net.gyp:net_resources',
101 '../net/net.gyp:net_test_support', 100 '../net/net.gyp:net_test_support',
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1708 '../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests', 1707 '../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests',
1709 '../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions _background_keepalive', 1708 '../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions _background_keepalive',
1710 '../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions _socket' 1709 '../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions _socket'
1711 ], 1710 ],
1712 'conditions': [ 1711 'conditions': [
1713 ['chromeos==1', { 1712 ['chromeos==1', {
1714 'sources': [ 1713 'sources': [
1715 '../third_party/liblouis/nacl_wrapper/liblouis_wrapper_brows ertest.cc', 1714 '../third_party/liblouis/nacl_wrapper/liblouis_wrapper_brows ertest.cc',
1716 ], 1715 ],
1717 'dependencies': [ 1716 'dependencies': [
1717 'browser_chromeos',
1718 '../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_dat a', 1718 '../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_dat a',
1719 ], 1719 ],
1720 }], 1720 }],
1721 ], 1721 ],
1722 }], 1722 }],
1723 ['OS=="win" or OS=="linux"', { 1723 ['OS=="win" or OS=="linux"', {
1724 'sources': [ 1724 'sources': [
1725 'browser/nacl_host/test/nacl_gdb_browsertest.cc', 1725 'browser/nacl_host/test/nacl_gdb_browsertest.cc',
1726 ], 1726 ],
1727 'dependencies': [ 1727 'dependencies': [
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
2433 }, 2433 },
2434 { 2434 {
2435 'target_name': 'sync_integration_tests', 2435 'target_name': 'sync_integration_tests',
2436 'type': 'executable', 2436 'type': 'executable',
2437 'dependencies': [ 2437 'dependencies': [
2438 'chrome_resources.gyp:chrome_resources', 2438 'chrome_resources.gyp:chrome_resources',
2439 'chrome_resources.gyp:chrome_strings', 2439 'chrome_resources.gyp:chrome_strings',
2440 'chrome_resources.gyp:packed_extra_resources', 2440 'chrome_resources.gyp:packed_extra_resources',
2441 'chrome_resources.gyp:packed_resources', 2441 'chrome_resources.gyp:packed_resources',
2442 'common', 2442 'common',
2443 'common/extensions/api/api.gyp:chrome_api',
2444 'renderer', 2443 'renderer',
2445 'test_support_sync_integration', 2444 'test_support_sync_integration',
2446 '../sync/sync.gyp:sync', 2445 '../sync/sync.gyp:sync',
2447 '../testing/gmock.gyp:gmock', 2446 '../testing/gmock.gyp:gmock',
2448 '../testing/gtest.gyp:gtest', 2447 '../testing/gtest.gyp:gtest',
2449 '../third_party/icu/icu.gyp:icui18n', 2448 '../third_party/icu/icu.gyp:icui18n',
2450 '../third_party/icu/icu.gyp:icuuc', 2449 '../third_party/icu/icu.gyp:icuuc',
2451 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 2450 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
2452 '../third_party/npapi/npapi.gyp:npapi', 2451 '../third_party/npapi/npapi.gyp:npapi',
2453 '../third_party/WebKit/public/blink.gyp:blink', 2452 '../third_party/WebKit/public/blink.gyp:blink',
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
2586 'browser/sync/test/integration/single_client_app_list_sync_test.cc', 2585 'browser/sync/test/integration/single_client_app_list_sync_test.cc',
2587 'browser/sync/test/integration/two_client_app_list_sync_test.cc', 2586 'browser/sync/test/integration/two_client_app_list_sync_test.cc',
2588 ], 2587 ],
2589 }], 2588 }],
2590 ], 2589 ],
2591 }, 2590 },
2592 { 2591 {
2593 'target_name': 'sync_performance_tests', 2592 'target_name': 'sync_performance_tests',
2594 'type': 'executable', 2593 'type': 'executable',
2595 'dependencies': [ 2594 'dependencies': [
2596 'common/extensions/api/api.gyp:chrome_api',
2597 'test/perf/perf_test.gyp:*', 2595 'test/perf/perf_test.gyp:*',
2598 'test_support_sync_integration', 2596 'test_support_sync_integration',
2599 '../sync/sync.gyp:sync', 2597 '../sync/sync.gyp:sync',
2600 '../testing/gmock.gyp:gmock', 2598 '../testing/gmock.gyp:gmock',
2601 '../testing/gtest.gyp:gtest', 2599 '../testing/gtest.gyp:gtest',
2602 ], 2600 ],
2603 'include_dirs': [ 2601 'include_dirs': [
2604 '..', 2602 '..',
2605 '<(INTERMEDIATE_DIR)', 2603 '<(INTERMEDIATE_DIR)',
2606 '<(protoc_out_dir)', 2604 '<(protoc_out_dir)',
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
3245 ['enable_webrtc==1', { 3243 ['enable_webrtc==1', {
3246 'dependencies': [ 3244 'dependencies': [
3247 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3245 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3248 ] 3246 ]
3249 }], 3247 }],
3250 ], 3248 ],
3251 }] 3249 }]
3252 }], 3250 }],
3253 ], # 'conditions' 3251 ], # 'conditions'
3254 } 3252 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698