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

Unified Diff: mojo/application/public/cpp/BUILD.gn

Issue 1139123006: Fork the mojo shell interfaces used by Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 7 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: mojo/application/public/cpp/BUILD.gn
diff --git a/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn b/mojo/application/public/cpp/BUILD.gn
similarity index 80%
rename from third_party/mojo/src/mojo/public/cpp/application/BUILD.gn
rename to mojo/application/public/cpp/BUILD.gn
index c3a9fc942fcf47852239640e13df96ecea713921..796f615edc2c1ba58b6cbe990ee92c499cb282a1 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn
+++ b/mojo/application/public/cpp/BUILD.gn
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("../../mojo_sdk.gni")
+import("//third_party/mojo/src/mojo/public/mojo_sdk.gni")
-# GYP version: mojo/public/mojo_public.gyp:mojo_application_base
+# GYP version: mojo/mojo_base.gyp:mojo_application_base
mojo_sdk_source_set("application") {
+ restrict_external_deps = false
sources = [
"application_connection.h",
"application_delegate.h",
@@ -26,15 +27,18 @@ mojo_sdk_source_set("application") {
"service_provider_impl.h",
]
+ deps = [
+ "//mojo/application/public/interfaces",
+ ]
+
mojo_sdk_deps = [
"mojo/public/cpp/bindings",
"mojo/public/cpp/environment",
"mojo/public/cpp/system",
- "mojo/public/interfaces/application",
]
}
-# GYP version: mojo/public/mojo_public.gyp:mojo_application_standalone
+# GYP version: mojo/mojo_base.gyp:mojo_application_standalone
mojo_sdk_source_set("standalone") {
sources = [
"lib/application_runner.cc",
@@ -52,6 +56,7 @@ mojo_sdk_source_set("standalone") {
mojo_sdk_source_set("test_support") {
testonly = true
+ restrict_external_deps = false
sources = [
"application_test_base.h",
"lib/application_test_base.cc",
@@ -59,6 +64,7 @@ mojo_sdk_source_set("test_support") {
deps = [
":application",
+ "//mojo/application/public/interfaces",
"//testing/gtest",
]
@@ -66,12 +72,12 @@ mojo_sdk_source_set("test_support") {
"mojo/public/cpp/bindings",
"mojo/public/cpp/environment",
"mojo/public/cpp/system",
- "mojo/public/interfaces/application",
]
}
mojo_sdk_source_set("test_support_standalone") {
testonly = true
+ restrict_external_deps = false
sources = [
"lib/application_test_main.cc",
]
@@ -82,13 +88,12 @@ mojo_sdk_source_set("test_support_standalone") {
deps = [
":application",
+ "//mojo/application/public/interfaces",
]
mojo_sdk_deps = [
- "mojo/public/interfaces/application",
"mojo/public/cpp/environment:standalone",
"mojo/public/cpp/system",
"mojo/public/cpp/utility",
- "mojo/public/interfaces/application",
]
}

Powered by Google App Engine
This is Rietveld 408576698