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

Unified Diff: chrome/test/BUILD.gn

Issue 1361523003: Add crash_service to Telemetry's isolates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fck
Patch Set: Add BUILD.gn changes. Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 70b22f56fe8863c32ca8ccd59fefda5592c15858..ff09218e2dc43f79ebd3277f83b73c1783ca100e 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -219,6 +219,19 @@ source_set("test_support") {
}
}
+source_set("telemtry_binary_deps") {
Dirk Pranke 2015/09/25 20:16:20 if there's no sources, it shouldn't be a source_se
aiolos (Not reviewing) 2015/09/25 20:40:06 Yep. I went with that since the only other target
+ # Telemetry's chrome built dependencies.
Dirk Pranke 2015/09/25 20:16:20 I don't understand this comment?
aiolos (Not reviewing) 2015/09/25 20:40:06 Meant to convey that this target is specifically f
+ data_deps = []
+
+ if (is_win) {
+ data_deps += [ "//content/shell:crash_service" ]
+ }
+
+ data = [
+ "//tools/perf/core/binary_dependencies.json",
+ ]
+}
+
if (!is_android) {
import("//third_party/protobuf/proto_library.gni")
@@ -600,6 +613,10 @@ if (!is_android) {
}
group("telemetry_gpu_test") {
+ deps = [
+ "//content/test:telemetry_test_support",
+ ":telemtry_binary_deps",
Dirk Pranke 2015/09/25 20:16:20 typo: ":telemetry" ?
aiolos (Not reviewing) 2015/09/25 20:40:07 Done.
+ ]
data_deps = [
"//chrome",
"//tools/telemetry:bitmaptools",
@@ -616,18 +633,6 @@ if (!is_android) {
# For webgl_conformance
"//third_party/webgl/",
"//content/test/gpu/run_gpu_test.py",
-
- # Generic telemetry deps
- # TODO(GYP): These should probably be specified somewhere else
- # and pulled in via a deps entry.
- "//build/android/devil/",
- "//build/android/pylib/",
- "//build/util/",
- "//third_party/WebKit/PerformanceTests/resources/jquery.tablesorter.min.js",
- "//third_party/WebKit/PerformanceTests/resources/statistics.js",
- "//third_party/flot/jquery.flot.min.js",
- "//third_party/webpagereplay/",
- "//tools/telemetry/",
]
if (is_win && (symbol_level == 1 || symbol_level == 2)) {

Powered by Google App Engine
This is Rietveld 408576698