Simplify //mojo/public/c/system targets
We don't support building mojo apps in the component build, so we can
simplify these system targets a bit. We don't need to have everything
depend on a forwarding group that always evaluates to the same thing in
the mojo repo.
The new targets are:
//mojo/public/c/system which contains the system headers but no
implementation.
//mojo/public/platform/native:system which contains the system thunks
and exported thunk setter, used by anything run by the shell. This is
mostly used by the mojo_native_application template but is also used
by a few targets that need to link as shared_lib but will ultimately
be loaded by the shell.
//mojo/edk/system provides the real implementation of the system calls
and is used by the shell and a few tests.
The :for_... groups need to stick around for now to keep chromium
working, but once this rolls in to the chromium tree then these can
be fixed up as well.
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/754963008
diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni
index 6f738bd..4fb23c9 100644
--- a/mojo/public/mojo_application.gni
+++ b/mojo/public/mojo_application.gni
@@ -62,7 +62,7 @@
if (use_prebuilt_mojo_shell) {
copy_mojo_shell =
- rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root)
+ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root)
}
# Copy the prebuilt mojo_shell if using it.
@@ -73,12 +73,17 @@
}
} else {
if (use_prebuilt_mojo_shell) {
- datadeps = [ copy_mojo_shell ]
+ datadeps = [
+ copy_mojo_shell,
+ ]
}
}
deps = rebase_path([
- "mojo/public/c/system:for_shared_library",
- ], ".", mojo_root)
+ "mojo/public/c/system",
+ "mojo/public/platform/native:system",
+ ],
+ ".",
+ mojo_root)
if (defined(invoker.deps)) {
deps += invoker.deps
}
@@ -116,9 +121,7 @@
testonly = invoker.testonly
}
- visibility = [
- ":${final_target_name}",
- ]
+ visibility = [ ":${final_target_name}" ]
}
copy(final_target_name) {
@@ -131,8 +134,12 @@
deps = [
":${library_target_name}",
]
- sources = [ "${root_out_dir}/${library_name}" ]
- outputs = [ "${root_out_dir}/${output}" ]
+ sources = [
+ "${root_out_dir}/${library_name}",
+ ]
+ outputs = [
+ "${root_out_dir}/${output}",
+ ]
}
}
@@ -159,7 +166,9 @@
]
output = zip_action_output
- outputs = [ output ]
+ outputs = [
+ output,
+ ]
rebase_inputs = rebase_path(inputs, root_build_dir)
rebase_output = rebase_path(output, root_build_dir)
@@ -179,10 +188,14 @@
script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root)
input = zip_action_output
- inputs = [ input ]
+ inputs = [
+ input,
+ ]
output = mojo_output
- outputs = [ output ]
+ outputs = [
+ output,
+ ]
rebase_input = rebase_path(input, root_build_dir)
rebase_output = rebase_path(output, root_build_dir)
