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

Unified Diff: mojo/BUILD.gn

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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 | « media/mojo/services/BUILD.gn ('k') | mojo/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/BUILD.gn
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index df7e878b10b77f8cea6f557389412908854fc416..33c86a244eda89db052c58e1ee9749be40e82c98 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -32,8 +32,7 @@ group("mojo") {
group("mojo_public_bindings_unittests_run") {
testonly = true
deps = [
- # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_bindings_unittests"
- "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
+ "//mojo/edk/test:mojo_public_bindings_unittests",
]
}
@@ -42,8 +41,7 @@ group("mojo_public_bindings_unittests_run") {
group("mojo_public_environment_unittests_run") {
testonly = true
deps = [
- # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_environment_unittests"
- "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
+ "//mojo/edk/test:mojo_public_environment_unittests",
]
}
@@ -52,8 +50,7 @@ group("mojo_public_environment_unittests_run") {
group("mojo_public_system_unittests_run") {
testonly = true
deps = [
- # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_system_unittests"
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
+ "//mojo/edk/test:mojo_public_system_unittests",
]
}
@@ -62,8 +59,7 @@ group("mojo_public_system_unittests_run") {
group("mojo_public_utility_unittests_run") {
testonly = true
deps = [
- # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_utility_unittests"
- "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
+ "//mojo/edk/test:mojo_public_utility_unittests",
]
}
@@ -73,25 +69,16 @@ group("tests") {
"//ipc/mojo:ipc_mojo_unittests",
"//mojo/common:mojo_common_unittests",
"//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
+ "//mojo/edk/js/test:js_integration_tests",
"//mojo/edk/js/test:js_unittests",
+ "//mojo/edk/system:mojo_message_pipe_perftests",
+ "//mojo/edk/system:mojo_system_unittests",
+ "//mojo/edk/test:mojo_public_bindings_unittests",
+ "//mojo/edk/test:mojo_public_environment_unittests",
+ "//mojo/edk/test:mojo_public_system_perftests",
+ "//mojo/edk/test:mojo_public_system_unittests",
+ "//mojo/edk/test:mojo_public_utility_unittests",
"//mojo/shell/public/cpp/tests:mojo_public_application_unittests",
-
- # TODO(use_chrome_edk):
- #"//mojo/edk/js/test:js_integration_tests2",
- #"//mojo/edk/system:mojo_message_pipe_perftests",
- #"//mojo/edk/system:mojo_system_unittests",
- #"//mojo/edk/test:mojo_public_bindings_unittests",
- #"//mojo/edk/test:mojo_public_environment_unittests",
- #"//mojo/edk/test:mojo_public_system_perftests",
- #"//mojo/edk/test:mojo_public_system_unittests",
- #"//mojo/edk/test:mojo_public_utility_unittests",
- "//third_party/mojo/src/mojo/edk/system:mojo_message_pipe_perftests",
- "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
- "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
- "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
- "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
]
deps += [
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | mojo/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698