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

Unified Diff: build/toolchain/gcc_toolchain.gni

Issue 557463002: Make base_unittests_apk actually work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-group-datadeps
Patch Set: Rebase Created 6 years, 3 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 | « build/toolchain/android/BUILD.gn ('k') | sync/test/accounts_client/test_accounts_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/gcc_toolchain.gni
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
index ea13aadcb93ca17b7f0699898a11af30d47421cf..5c31a8e5f7eb6c005b7cf0f10836bbe0bbe8343c 100644
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -163,6 +163,9 @@ template("gcc_toolchain") {
sofile,
tocfile,
]
+ if (defined(invoker.solink_outputs)) {
+ outputs += invoker.solink_outputs
+ }
link_output = sofile
depend_output = tocfile
}
@@ -171,9 +174,15 @@ template("gcc_toolchain") {
outfile = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}"
rspfile = "$outfile.rsp"
command = "$ld {{ldflags}} -o $outfile -Wl,--start-group @$rspfile {{solibs}} -Wl,--end-group $libs_section_prefix {{libs}} $libs_section_postfix"
+ if (defined(invoker.postlink)) {
+ command += " && " + invoker.postlink
+ }
description = "LINK $outfile"
rspfile_content = "{{inputs}}"
outputs = [ outfile ]
+ if (defined(invoker.link_outputs)) {
+ outputs += invoker.link_outputs
+ }
}
tool("stamp") {
« no previous file with comments | « build/toolchain/android/BUILD.gn ('k') | sync/test/accounts_client/test_accounts_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698