| 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 'chrome_browser_extensions_test_support_sources': [ | 6 'chrome_browser_extensions_test_support_sources': [ |
| 7 # A list of sources which is shared between different browser tests. | 7 # A list of sources which is shared between different browser tests. |
| 8 'browser/apps/app_browsertest_util.cc', | 8 'browser/apps/app_browsertest_util.cc', |
| 9 'browser/apps/app_browsertest_util.h', | 9 'browser/apps/app_browsertest_util.h', |
| 10 'browser/extensions/browsertest_util.cc', | 10 'browser/extensions/browsertest_util.cc', |
| (...skipping 2734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2745 # The sync_integration_tests do not run on mac without this flag. | 2745 # The sync_integration_tests do not run on mac without this flag. |
| 2746 # Search for comments about "xcode_settings" elsewhere in this file. | 2746 # Search for comments about "xcode_settings" elsewhere in this file. |
| 2747 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 2747 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 2748 # Dictionary sync is disabled on Mac. | 2748 # Dictionary sync is disabled on Mac. |
| 2749 # Note: list duplicated in GN build. | 2749 # Note: list duplicated in GN build. |
| 2750 'sources!': [ | 2750 'sources!': [ |
| 2751 'browser/sync/test/integration/multiple_client_dictionary_sync_test.
cc', | 2751 'browser/sync/test/integration/multiple_client_dictionary_sync_test.
cc', |
| 2752 'browser/sync/test/integration/single_client_dictionary_sync_test.cc
', | 2752 'browser/sync/test/integration/single_client_dictionary_sync_test.cc
', |
| 2753 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', | 2753 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', |
| 2754 ], | 2754 ], |
| 2755 'dependencies': [ | |
| 2756 'chrome', | |
| 2757 ], | |
| 2758 }], | 2755 }], |
| 2759 ['OS=="win"', { | 2756 ['OS=="win"', { |
| 2760 'sources': [ | 2757 'sources': [ |
| 2761 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', | 2758 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
| 2762 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', | 2759 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', |
| 2763 ], | 2760 ], |
| 2764 'include_dirs': [ | 2761 'include_dirs': [ |
| 2765 '<(DEPTH)/third_party/wtl/include', | 2762 '<(DEPTH)/third_party/wtl/include', |
| 2766 ], | 2763 ], |
| 2767 'dependencies': [ | 2764 'dependencies': [ |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3253 ['enable_webrtc==1', { | 3250 ['enable_webrtc==1', { |
| 3254 'dependencies': [ | 3251 'dependencies': [ |
| 3255 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3252 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3256 ] | 3253 ] |
| 3257 }], | 3254 }], |
| 3258 ], | 3255 ], |
| 3259 }] | 3256 }] |
| 3260 }], | 3257 }], |
| 3261 ], # 'conditions' | 3258 ], # 'conditions' |
| 3262 } | 3259 } |
| OLD | NEW |