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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: BUILD.gn

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | « no previous file | base/files/file_path_watcher_win.cc » ('j') | base/win/object_watcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 8ca8bb34923ce99cc48032c935469701151f5f77..0159c6c702808d2496661772c7e3c18898b4e2d4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -149,11 +149,6 @@ group("both_gn_and_gyp") {
"//third_party/WebKit/Source/wtf:wtf_unittests",
"//third_party/cacheinvalidation:cacheinvalidation_unittests",
"//third_party/codesighs",
- "//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_unittests",
- "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
"//third_party/pdfium/samples:pdfium_test",
"//third_party/smhasher:pmurhash",
"//tools/imagediff($host_toolchain)",
@@ -168,6 +163,24 @@ group("both_gn_and_gyp") {
"//ui/gl:gl_unittests",
"//ui/touch_selection:ui_touch_selection_unittests",
]
+
+ if (use_chrome_edk) {
+ deps += [
+ "//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_unittests",
+ "//mojo/edk/test:mojo_public_utility_unittests",
+ ]
+ } else {
+ deps += [
+ "//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_unittests",
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
+ ]
+ }
}
deps += root_extra_deps
@@ -466,7 +479,6 @@ group("both_gn_and_gyp") {
"//sync/tools:sync_client",
"//sync/tools:sync_listen_notifications",
"//testing/gmock:gmock_main",
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
"//tools/perf/clear_system_cache",
"//ui/keyboard:keyboard_unittests",
"//ui/message_center:message_center_unittests",
@@ -477,6 +489,12 @@ group("both_gn_and_gyp") {
"//third_party/sqlite:sqlite_shell",
]
+ if (use_chrome_edk) {
+ deps += [ "//mojo/edk/test:mojo_public_system_perftests" ]
+ } else {
+ deps += [ "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests" ]
+ }
+
if (current_toolchain == host_toolchain) {
# Do not build the breakpad utilities in cross-compiles.
deps += [
@@ -730,12 +748,22 @@ group("gn_mojo_targets") {
"//media/mojo:tests",
"//mojo:tests",
"//net/interfaces:interfaces_python",
- "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests",
- "//third_party/mojo/src/mojo/edk/js/tests:js_to_cpp_bindings_python",
"//third_party/mojo/src/mojo/public/python:packaged_application",
"//third_party/mojo/src/mojo/public/python:packaged_bindings",
"//third_party/mojo_services/src/accessibility/public/interfaces:interfaces_python",
]
+
+ if (use_chrome_edk) {
+ deps += [
+ "//mojo/edk/js/test:js_integration_tests",
+ "//mojo/edk/js/tests:js_to_cpp_bindings_python",
+ ]
+ } else {
+ deps += [
+ "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests",
+ "//third_party/mojo/src/mojo/edk/js/tests:js_to_cpp_bindings_python",
+ ]
+ }
}
}
@@ -855,11 +883,6 @@ if (is_linux) {
"//sql:sql_unittests", # PASSES 2/25/2015
"//sync:sync_unit_tests", # PASSES 2/25/2015
"//third_party/cacheinvalidation:cacheinvalidation_unittests", # PASSES 2/25/2015
- "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", # PASSES 2/25/2015
- "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", # PASSES 2/25/2015
- "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", # PASSES 2/25/2015
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", # PASSES 2/25/2015
- "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
"//ui/accessibility:accessibility_unittests", # PASSES 2/25/2015
"//ui/app_list:app_list_unittests", # PASSES 2/25/2015
"//ui/aura:aura_unittests", # PASSES 2/25/2015
@@ -878,6 +901,24 @@ if (is_linux) {
# (*) Fails but failures match GYP build at time of testing.
]
+ if (use_chrome_edk) {
+ deps += [
+ "//mojo/edk/system:mojo_system_unittests", # PASSES 2/25/2015
+ "//mojo/edk/test:mojo_public_bindings_unittests", # PASSES 2/25/2015
+ "//mojo/edk/test:mojo_public_environment_unittests", # PASSES 2/25/2015
+ "//mojo/edk/test:mojo_public_system_unittests", # PASSES 2/25/2015
+ "//mojo/edk/test:mojo_public_utility_unittests",
+ ]
+ } else {
+ deps += [
+ "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", # PASSES 2/25/2015
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", # PASSES 2/25/2015
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", # PASSES 2/25/2015
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", # PASSES 2/25/2015
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
+ ]
+ }
+
if (enable_nacl) {
deps += [ "//components/nacl:nacl_loader_unittests" ] # PASSES 3/28/2015
}
@@ -927,11 +968,6 @@ if (is_linux) {
"//sql:sql_unittests", # PASSES 4/17/2015
"//sync:sync_unit_tests", # PASSES 4/20/2015
"//third_party/cacheinvalidation:cacheinvalidation_unittests", # PASSES 4/20/2015
- "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", # Seems to hang?
- "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", # FAILS
- "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", # PASSES 4/20/2015
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", # PASSES 4/20/2015
- "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", # PASSES 4/20/2015
"//ui/accessibility:accessibility_unittests", # PASSES 4/20/2015
"//ui/app_list:app_list_unittests", # PASSES 4/20/2015
"//ui/aura:aura_unittests", # PASSES 4/17/2015
@@ -951,5 +987,23 @@ if (is_linux) {
# TODO(GYP) telemetry_perf_unittests
# TODO(GYP) telemetry_unittests
]
+
+ if (use_chrome_edk) {
+ deps += [
+ "//mojo/edk/system:mojo_system_unittests", # Seems to hang?
+ "//mojo/edk/test:mojo_public_bindings_unittests", # FAILS
+ "//mojo/edk/test:mojo_public_environment_unittests", # PASSES 4/20/2015
+ "//mojo/edk/test:mojo_public_system_unittests", # PASSES 4/20/2015
+ "//mojo/edk/test:mojo_public_utility_unittests", # PASSES 4/20/2015
+ ]
+ } else {
+ deps += [
+ "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", # Seems to hang?
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", # FAILS
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", # PASSES 4/20/2015
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", # PASSES 4/20/2015
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", # PASSES 4/20/2015
+ ]
+ }
}
}
« no previous file with comments | « no previous file | base/files/file_path_watcher_win.cc » ('j') | base/win/object_watcher.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698