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

Unified Diff: mojo/public/mojo_application.gni

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 | « mojo/public/mojo.gni ('k') | mojo/public/mojo_sdk.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/mojo_application.gni
diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni
index 1609b0250a31740374cae0214f0cbc249420685f..72398b758bd415edcf56921fb86630e763a1f3ed 100644
--- a/mojo/public/mojo_application.gni
+++ b/mojo/public/mojo_application.gni
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/toolchain/toolchain.gni")
-import("mojo.gni")
# Generate a binary Mojo application in a self-named directory.
# Application resources are copied to a "resources" directory alongside the app.
@@ -83,24 +82,11 @@ template("mojo_native_application") {
data_deps += invoker.data_deps
}
- # Copy any necessary prebuilt artifacts.
- if (mojo_use_prebuilt_mojo_shell) {
- data_deps +=
- [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ]
- }
- if (mojo_use_prebuilt_network_service) {
- data_deps += [ rebase_path("mojo/public/tools:copy_network_service",
- ".",
- mojo_root) ]
- }
-
- deps = rebase_path([
- "mojo/public/gles2:for_shared_library",
- "mojo/public/c/system:for_shared_library",
- ],
- ".",
- mojo_root)
- deps += [ "//mojo/platform_handle:for_shared_library" ]
+ deps = [
+ "//mojo/platform_handle:for_shared_library",
+ "//mojo/public/gles2:for_shared_library",
+ "//mojo/public/c/system:for_shared_library",
+ ]
deps += mojo_deps
if (defined(invoker.public_deps)) {
@@ -200,23 +186,11 @@ template("mojo_native_application") {
data_deps = invoker.data_deps
}
- # Copy any necessary prebuilt artifacts.
- if (mojo_use_prebuilt_mojo_shell) {
- data_deps +=
- [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ]
- }
- if (mojo_use_prebuilt_network_service) {
- data_deps += [ rebase_path("mojo/public/tools:copy_network_service",
- ".",
- mojo_root) ]
- }
+ deps = [
+ "//mojo/public/c/system",
+ "//mojo/public/platform/nacl:system",
+ ]
- deps = rebase_path([
- "mojo/public/c/system",
- "mojo/public/platform/nacl:system",
- ],
- ".",
- mojo_root)
deps += mojo_deps
if (defined(invoker.public_deps)) {
public_deps = invoker.public_deps
@@ -260,7 +234,7 @@ template("mojo_native_application") {
visibility = invoker.visibility
}
- script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root)
+ script = "//mojo/public/tools/prepend.py"
input_path = "${root_out_dir}/${nexe_name}"
inputs = [
@@ -361,7 +335,7 @@ if (is_android) {
}
action(target_name) {
- script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root)
+ script = "//mojo/public/tools/prepend.py"
base_target_name = target_name
if (defined(invoker.output_name)) {
« no previous file with comments | « mojo/public/mojo.gni ('k') | mojo/public/mojo_sdk.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698