OLD | NEW |
---|---|
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import("//build/config/compiler/compiler.gni") | 5 import("//build/config/compiler/compiler.gni") |
6 | 6 |
7 if (is_win) { | 7 if (is_win) { |
8 action("copy_cdb_to_output") { | 8 action("copy_cdb_to_output") { |
9 script = "//build/win/copy_cdb_to_output.py" | 9 script = "//build/win/copy_cdb_to_output.py" |
10 inputs = [ | 10 inputs = [ |
(...skipping 14 matching lines...) Expand all Loading... | |
25 | 25 |
26 group("telemetry_chrome_test") { | 26 group("telemetry_chrome_test") { |
27 testonly = true | 27 testonly = true |
28 | 28 |
29 if (is_android) { | 29 if (is_android) { |
30 data_deps = [ | 30 data_deps = [ |
31 "//content/shell:content_shell", | 31 "//content/shell:content_shell", |
32 ] | 32 ] |
33 } else { | 33 } else { |
34 data_deps = [ | 34 data_deps = [ |
35 "//third_party/catapult/telemetry:bitmaptools", | |
36 ] | |
37 | |
38 if (!is_mac) { | |
35 # TODO(kbr): this used to be "//chrome". Had to change this to | 39 # TODO(kbr): this used to be "//chrome". Had to change this to |
36 # chrome_initial temporarily to work around crbug.com/536192. | 40 # chrome_initial temporarily to work around crbug.com/536192. |
37 "//chrome:chrome_initial", | 41 data_deps += [ "//chrome:chrome_initial" ] |
38 "//third_party/catapult/telemetry:bitmaptools", | 42 } else { |
39 ] | 43 data_deps += [ "//chrome" ] |
44 } | |
Dirk Pranke
2016/05/06 22:10:07
I think this bug/workaround has been fixed and we
Robert Sesek
2016/05/06 22:20:49
Yeah, I figured this would be better to handle in
| |
40 } | 45 } |
41 | 46 |
42 data = [ | 47 data = [ |
43 "//tools/perf/chrome_telemetry_build/", | 48 "//tools/perf/chrome_telemetry_build/", |
44 "//third_party/catapult/", | 49 "//third_party/catapult/", |
45 ] | 50 ] |
46 | 51 |
47 if (is_win) { | 52 if (is_win) { |
48 data_deps += [ "//chrome:reorder_imports" ] | 53 data_deps += [ "//chrome:reorder_imports" ] |
49 data += [ "//components/crash/content/tools/generate_breakpad_symbols.py" ] | 54 data += [ "//components/crash/content/tools/generate_breakpad_symbols.py" ] |
(...skipping 20 matching lines...) Expand all Loading... | |
70 "$root_out_dir/base.dll.pdb", | 75 "$root_out_dir/base.dll.pdb", |
71 "$root_out_dir/blink_platform.dll.pdb", | 76 "$root_out_dir/blink_platform.dll.pdb", |
72 "$root_out_dir/blink_web.dll.pdb", | 77 "$root_out_dir/blink_web.dll.pdb", |
73 "$root_out_dir/content.dll.pdb", | 78 "$root_out_dir/content.dll.pdb", |
74 ] | 79 ] |
75 } else { | 80 } else { |
76 data += [ "$root_out_dir/chrome_child.dll.pdb" ] | 81 data += [ "$root_out_dir/chrome_child.dll.pdb" ] |
77 } | 82 } |
78 } | 83 } |
79 } | 84 } |
OLD | NEW |