Chromium Code Reviews| 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 2857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2868 'dependencies': [ | 2868 'dependencies': [ |
| 2869 # Runtime dependencies. | 2869 # Runtime dependencies. |
| 2870 '../media/media.gyp:clearkeycdmadapter', | 2870 '../media/media.gyp:clearkeycdmadapter', |
| 2871 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', | 2871 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', |
| 2872 ], | 2872 ], |
| 2873 }], | 2873 }], |
| 2874 ], | 2874 ], |
| 2875 }, # target 'load_library_perf_tests' | 2875 }, # target 'load_library_perf_tests' |
| 2876 ], | 2876 ], |
| 2877 'conditions': [ | 2877 'conditions': [ |
| 2878 ['OS!="mac"', { | |
| 2879 'targets': [ | |
| 2880 { | |
| 2881 # This test appears to be a legacy target consisting of files not yet | |
| 2882 # moved elsewhere. | |
| 2883 # | |
| 2884 # GN version: //chrome/test/perf | |
| 2885 'target_name': 'perf_tests', | |
| 2886 'type': 'executable', | |
| 2887 'dependencies': [ | |
| 2888 '../base/base.gyp:base', | |
| 2889 '../base/base.gyp:test_support_perf', | |
| 2890 '../testing/gtest.gyp:gtest', | |
| 2891 '../url/url.gyp:url_lib', | |
| 2892 ], | |
| 2893 'sources': [ | |
| 2894 # Note: Sources list duplicated in GN build. | |
| 2895 'test/perf/perftests.cc', | |
| 2896 'test/perf/url_parse_perftest.cc', | |
|
tfarina
2015/02/18 19:17:40
I want to deal with url_parse_perftest.cc in a fol
Lei Zhang
2015/02/18 20:25:28
Do you want to deal with it first? If we land this
tfarina
2015/02/18 20:28:46
Maybe. The problem is that this file does nothing
| |
| 2897 ], | |
| 2898 'conditions': [ | |
| 2899 ['OS=="win"', { | |
| 2900 'configurations': { | |
| 2901 'Debug_Base': { | |
| 2902 'msvs_settings': { | |
| 2903 'VCLinkerTool': { | |
| 2904 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | |
| 2905 }, | |
| 2906 }, | |
| 2907 }, | |
| 2908 }, | |
| 2909 'conditions': [ | |
| 2910 ['win_use_allocator_shim==1', { | |
| 2911 'dependencies': [ | |
| 2912 '<(allocator_target)', | |
| 2913 ], | |
| 2914 }], | |
| 2915 ], | |
| 2916 }], | |
| 2917 ['os_posix == 1 and OS != "mac" and OS != "android"', { | |
| 2918 'conditions': [ | |
| 2919 ['use_allocator!="none"', { | |
| 2920 'dependencies': [ | |
| 2921 '../base/allocator/allocator.gyp:allocator', | |
| 2922 ], | |
| 2923 }], | |
| 2924 ], | |
| 2925 }], | |
| 2926 ], | |
| 2927 }, | |
| 2928 ], | |
| 2929 },], # OS!="mac" | |
| 2930 ['OS == "android"', { | 2878 ['OS == "android"', { |
| 2931 'targets': [ | 2879 'targets': [ |
| 2932 { | 2880 { |
| 2933 # GN: //chrome/android:chrome_shell_test_apk | 2881 # GN: //chrome/android:chrome_shell_test_apk |
| 2934 'target_name': 'chrome_shell_test_apk', | 2882 'target_name': 'chrome_shell_test_apk', |
| 2935 'type': 'none', | 2883 'type': 'none', |
| 2936 'dependencies': [ | 2884 'dependencies': [ |
| 2937 'chrome_java', | 2885 'chrome_java', |
| 2938 'chrome_shell_apk_java', | 2886 'chrome_shell_apk_java', |
| 2939 'chrome_java_test_support', | 2887 'chrome_java_test_support', |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3204 ['enable_webrtc==1', { | 3152 ['enable_webrtc==1', { |
| 3205 'dependencies': [ | 3153 'dependencies': [ |
| 3206 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3154 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3207 ] | 3155 ] |
| 3208 }], | 3156 }], |
| 3209 ], | 3157 ], |
| 3210 }] | 3158 }] |
| 3211 }], | 3159 }], |
| 3212 ], # 'conditions' | 3160 ], # 'conditions' |
| 3213 } | 3161 } |
| OLD | NEW |