WIP // DO NOT SUBMIT

build/config/mac/rules.gni

Index: build/config/mac/rules.gni
diff --git a/build/config/mac/rules.gni b/build/config/mac/rules.gni
index a1c3c2ca16473849aab63d18cf8d05ce57e8d0b3..511dea1205dd83830b3d5e1ae6f14dfdbb1eccc3 100644
--- a/build/config/mac/rules.gni
+++ b/build/config/mac/rules.gni
@@ -156,6 +156,8 @@ template("mac_framework_bundle") {
 
   _info_plist_target = target_name + "_info_plist"
 
+  if (defined(invoker.linker_inputs)) { assert(invoker.linker_inputs != []) }
+
   mac_info_plist(_info_plist_target) {
     executable_name = target_name
     if (defined(invoker.output_name)) {
@@ -217,6 +219,11 @@ template("mac_framework_bundle") {
 #     remove_configs:
 #         (optional) list of label, default configs to remove from the target.
 #
+#     linker_inputs:
+#         (optional) list of string, additional inputs to list to the link step
+#         that are not source files. Examples would be strip, save, or order
+#         files.
+#
 #     extra_substitutions:
 #         (optional) string array, 'key=value' pairs for extra fields which are
 #         specified in a source Info.plist template.
@@ -232,6 +239,9 @@ template("mac_app_bundle") {
 
   _info_plist_target = target_name + "_info_plist"
 
+  # Hack for https://crbug.com/395883.
+  if (defined(invoker.linker_inputs)) { assert(invoker.linker_inputs != []) }
+
   mac_info_plist(_info_plist_target) {
     executable_name = _output_name
     forward_variables_from(invoker,
@@ -276,6 +286,9 @@ template("mac_app_bundle") {
     if (defined(remove_configs)) {
       configs -= remove_configs
     }
+    if (defined(invoker.linker_inputs)) {
+      inputs = invoker.linker_inputs
+    }
     output_name = _output_name
     output_dir = "$target_out_dir/$_executable_target"
   }