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

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

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years 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/public/cpp/application/BUILD.gn
diff --git a/mojo/public/cpp/application/BUILD.gn b/mojo/public/cpp/application/BUILD.gn
index b224c4a0ac8ed434d9779b32815b7ddb592bbd2e..1c8842d4fb6b9168adc0849a1c98f5b7ac4dbfc2 100644
--- a/mojo/public/cpp/application/BUILD.gn
+++ b/mojo/public/cpp/application/BUILD.gn
@@ -2,8 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("../../mojo_sdk.gni")
+
# GYP version: mojo/public/mojo_public.gyp:mojo_application_base
-source_set("application") {
+mojo_sdk_source_set("application") {
sources = [
"application_connection.h",
"application_delegate.h",
@@ -24,16 +26,16 @@ source_set("application") {
"lib/weak_service_provider.h",
]
- deps = [
- "//mojo/public/cpp/bindings",
- "//mojo/public/cpp/environment",
- "//mojo/public/cpp/system",
- "//mojo/public/interfaces/application",
+ 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
-source_set("standalone") {
+mojo_sdk_source_set("standalone") {
sources = [
"lib/application_runner.cc",
]
@@ -42,13 +44,13 @@ source_set("standalone") {
":application",
]
- deps = [
- "//mojo/public/cpp/environment:standalone",
- "//mojo/public/cpp/utility",
+ mojo_sdk_deps = [
+ "mojo/public/cpp/environment:standalone",
+ "mojo/public/cpp/utility",
]
}
-source_set("test_support") {
+mojo_sdk_source_set("test_support") {
testonly = true
sources = [
"application_test_base.h",
@@ -57,14 +59,17 @@ source_set("test_support") {
deps = [
":application",
- "//mojo/public/cpp/bindings",
- "//mojo/public/cpp/environment",
- "//mojo/public/cpp/system",
"//testing/gtest",
]
+
+ mojo_sdk_deps = [
+ "mojo/public/cpp/bindings",
+ "mojo/public/cpp/environment",
+ "mojo/public/cpp/system",
+ ]
}
-source_set("test_support_standalone") {
+mojo_sdk_source_set("test_support_standalone") {
testonly = true
sources = [
"lib/application_test_main.cc",
@@ -73,10 +78,14 @@ source_set("test_support_standalone") {
public_deps = [
":test_support",
]
+
deps = [
":application",
- "//mojo/public/cpp/environment:standalone",
- "//mojo/public/cpp/system",
- "//mojo/public/cpp/utility",
+ ]
+
+ mojo_sdk_deps = [
+ "mojo/public/cpp/environment:standalone",
+ "mojo/public/cpp/system",
+ "mojo/public/cpp/utility",
]
}

Powered by Google App Engine
This is Rietveld 408576698