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

Unified Diff: extensions/BUILD.gn

Issue 1258753002: Add yet more GN isolates ... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@isolates_4_2
Patch Set: add sql_unittests to swarming, remove interactive_ui_tests, move mojo rules Created 5 years, 5 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: extensions/BUILD.gn
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index c64f5b105c86787e3eab85cff4e0306dae4eab9e..ad78be84a23c185d95b27a4f5a0b7a1b3c9c2d1d 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -137,6 +137,15 @@ repack("shell_and_test_pak") {
]
}
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("extensions_unittests_run") {
+ testonly = true
+ deps = [
+ ":extensions_unittests",
+ ]
+}
+
test("extensions_unittests") {
sources =
rebase_path(extensions_tests_gypi_values.extensions_unittests_sources,
@@ -151,6 +160,12 @@ test("extensions_unittests") {
configs += [ "//build/config:precompiled_headers" ]
+ data = [
+ "test/data/",
+ "//chrome/test/data/extensions/",
+ "$root_out_dir/extensions_shell_and_test.pak",
+ ]
+
deps = [
":extensions_resources",
":shell_and_test_pak",
@@ -179,6 +194,8 @@ test("extensions_unittests") {
"//third_party/mojo/src/mojo/public/cpp/bindings",
]
+ data_deps = [ "//third_party/mesa:osmesa" ]
+
if (is_win) {
deps += [ "//base/allocator" ]
}
@@ -194,12 +211,31 @@ test("extensions_unittests") {
}
}
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("extensions_browsertests_run") {
+ testonly = true
+ deps = [
+ ":extensions_browsertests",
+ ]
+}
+
test("extensions_browsertests") {
sources =
rebase_path(extensions_tests_gypi_values.extensions_browsertests_sources,
".",
"//extensions")
+ data = [
+ "test/data/",
+ "//net/data/",
+ "//net/tools/testserver/",
+ "//third_party/pyftpdlib/",
+ "//third_party/pywebsocket/",
+ "//third_party/tlslite/",
+ "$root_out_dir/extensions_shell_and_test.pak",
+ ]
+
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
deps = [
@@ -222,8 +258,14 @@ test("extensions_browsertests") {
"//third_party/mojo/src/mojo/public/cpp/bindings",
]
+ data_deps = [ "//third_party/mesa:osmesa" ]
+
if (is_win) {
deps += [ "//base/allocator" ]
+
+ if (target_cpu == "x86") {
+ data_deps += [ "$root_out_dir/wow_helper.exe" ]
+ }
}
if (is_mac) {
« no previous file with comments | « components/nacl/BUILD.gn ('k') | google_apis/gcm/BUILD.gn » ('j') | net/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698