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

Unified Diff: third_party/mojo/src/mojo/public/mojo_application.gni

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 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 | « third_party/mojo/src/mojo/public/mojo.gni ('k') | third_party/mojo/src/mojo/public/python/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/src/mojo/public/mojo_application.gni
diff --git a/third_party/mojo/src/mojo/public/mojo_application.gni b/third_party/mojo/src/mojo/public/mojo_application.gni
index 7661c8885625444b1b6a087f8750409bbcfb84e4..77ed4bbb46353cbf9573a270afe11f5473a97036 100644
--- a/third_party/mojo/src/mojo/public/mojo_application.gni
+++ b/third_party/mojo/src/mojo/public/mojo_application.gni
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/module_args/mojo.gni")
import("mojo.gni")
import("mojo_sdk.gni")
@@ -68,22 +69,22 @@ template("mojo_native_application") {
libs = invoker.libs
}
- if (use_prebuilt_mojo_shell) {
- copy_mojo_shell =
- rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root)
- }
-
- # Copy the prebuilt mojo_shell if using it.
+ data_deps = []
if (defined(invoker.data_deps)) {
data_deps = invoker.data_deps
- if (use_prebuilt_mojo_shell) {
- data_deps += [ copy_mojo_shell ]
- }
- } else {
- if (use_prebuilt_mojo_shell) {
- data_deps = [ copy_mojo_shell ]
- }
}
+
+ # Copy any necessary prebuilt artifacts.
+ if (use_prebuilt_mojo_shell) {
+ data_deps +=
+ [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ]
+ }
+ if (use_prebuilt_network_service) {
+ data_deps += [ rebase_path("mojo/public/tools:copy_network_service",
+ ".",
+ mojo_root) ]
+ }
+
deps = rebase_path([
"mojo/public/c/system",
"mojo/public/platform/native:system",
« no previous file with comments | « third_party/mojo/src/mojo/public/mojo.gni ('k') | third_party/mojo/src/mojo/public/python/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698