Index: mojo/public/mojo_application.gni |
diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni |
index 05ec369862140f17e54d5636ec5c573eb6ba0fa8..d28cb440aaa98fd709f101c697539f6c6d392cd2 100644 |
--- a/mojo/public/mojo_application.gni |
+++ b/mojo/public/mojo_application.gni |
@@ -2,7 +2,8 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-import("//mojo/public/mojo.gni") |
+import("mojo.gni") |
+import("mojo_sdk.gni") |
# Generate a binary mojo application.The parameters of this template are those |
# of a shared library. |
@@ -58,19 +59,28 @@ template("mojo_native_application") { |
if (defined(invoker.libs)) { |
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. |
if (defined(invoker.datadeps)) { |
datadeps = invoker.datadeps |
if (use_prebuilt_mojo_shell) { |
- datadeps += [ "//mojo/public/tools:copy_mojo_shell" ] |
+ datadeps += [ copy_mojo_shell ] |
} |
} else { |
if (use_prebuilt_mojo_shell) { |
- datadeps = [ "//mojo/public/tools:copy_mojo_shell" ] |
+ datadeps = [ copy_mojo_shell ] |
} |
} |
+ deps = rebase_path([ |
+ "mojo/public/c/system:for_shared_library", |
+ ], ".", mojo_root) |
if (defined(invoker.deps)) { |
- deps = invoker.deps |
+ deps += invoker.deps |
} |
if (defined(invoker.forward_dependent_configs_from)) { |
forward_dependent_configs_from = invoker.forward_dependent_configs_from |
@@ -166,7 +176,7 @@ if (is_android) { |
} |
action(target_name) { |
- script = "//mojo/public/tools/prepend.py" |
+ script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root) |
input = zip_action_output |
inputs = [ input ] |