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

Unified Diff: chrome/test/BUILD.gn

Issue 1369213004: Revert of Add crash_service to Telemetry's isolates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fck
Patch Set: 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
« no previous file with comments | « chrome/telemetry_gpu_unittests.isolate ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 14949614d3e3274bb3319452a43d29b87c4484ce..666b2aab12fb7067560af4aea36061484148c938 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -234,18 +234,6 @@
}
}
-group("telemetry_binary_deps") {
- 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")
@@ -627,10 +615,6 @@
}
group("telemetry_gpu_test") {
- deps = [
- "//tools/telemetry:telemetry_test_support",
- ":telemetry_binary_deps",
- ]
data_deps = [
# TODO(kbr): this used to be "//chrome". Had to change this to
# chrome_initial temporarily to work around crbug.com/536192.
@@ -649,6 +633,18 @@
# 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)) {
« no previous file with comments | « chrome/telemetry_gpu_unittests.isolate ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698