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

Unified Diff: extensions/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: move to mojo::edk namespace in preparation for runtim flag 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: extensions/BUILD.gn
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index e58246b0983d7aad80f732c58c371f71c862c1b5..ada07339ba47f19224ae194c9bba085497c7b81d 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -196,11 +196,21 @@ test("extensions_unittests") {
"//testing/gmock",
"//testing/gtest",
"//third_party/leveldatabase",
- "//third_party/mojo/src/mojo/edk/js",
- "//third_party/mojo/src/mojo/edk/system",
"//third_party/mojo/src/mojo/public/cpp/bindings",
]
+ if (use_chrome_edk) {
+ deps += [
+ "//mojo/edk/js",
+ "//mojo/edk/system",
+ ]
+ } else {
+ deps += [
+ "//third_party/mojo/src/mojo/edk/js",
+ "//third_party/mojo/src/mojo/edk/system",
+ ]
+ }
+
data_deps = [ "//third_party/mesa:osmesa" ]
if (is_win) {
@@ -260,11 +270,21 @@ test("extensions_browsertests") {
"//mojo/environment:chromium",
"//testing/gmock",
"//testing/gtest",
- "//third_party/mojo/src/mojo/edk/js",
- "//third_party/mojo/src/mojo/edk/system",
"//third_party/mojo/src/mojo/public/cpp/bindings",
]
+ if (use_chrome_edk) {
+ deps += [
+ "//mojo/edk/js",
+ "//mojo/edk/system",
+ ]
+ } else {
+ deps += [
+ "//third_party/mojo/src/mojo/edk/js",
+ "//third_party/mojo/src/mojo/edk/system",
+ ]
+ }
+
data_deps = [ "//third_party/mesa:osmesa" ]
if (is_win) {

Powered by Google App Engine
This is Rietveld 408576698