Support C and Objective-C in jumbo base scripts.

build/config/jumbo.gni

 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/split_static_library.gni")  # When someone uses that target_type
 
 declare_args() {
   # If true, use a jumbo build (files compiled together) to speed up
   # compilation.
-  use_jumbo_build = false
+  use_jumbo_build = !is_official_build && !(is_android && !is_clang)

[Daniel Bratell, 2017/07/04 11:37:44]

Just to make cq test it. Must not be committed.

 
   # A target to exclude from jumbo builds, for optimal round trip time
   # when frequently changing a single cpp file.
   jumbo_build_excluded = ""
 
   # How many files to group at most. Smaller numbers give more
   # parallellism, higher numbers give less total CPU usage. Higher
   # numbers also give longer single-file recompilation times.
   #
   # Recommendations:
@@ skipping 58 matching lines @@
     foreach(source_file, invoker.sources) {
       if (current_file_index == next_chunk_start) {
         jumbo_files += [ "$gen_target_dir/" + target_name + "_jumbo_" +
                          next_chunk_number + ".cc" ]
         next_chunk_number += 1
         next_chunk_start += files_per_chunk
       }
       current_file_index += 1
     }
 
+    has_objective_c_file = false
+    has_c_file = false
+    foreach(source_file, invoker.sources) {
+      source_ext = get_path_info(source_file, "extension")
+      if (source_ext == "c") {
+        has_c_file = true
+      } else if (source_ext == "mm") {
+        has_objective_c_file = true
+      }
+    }
+    if (has_c_file) {
+      jumbo_files += [ "$gen_target_dir/" + target_name + "_jumbo_c.c" ]
+    }
+    if (has_objective_c_file) {
+      jumbo_files += [ "$gen_target_dir/" + target_name + "_jumbo_mm.mm" ]
+    }

[Dirk Pranke, 2017/07/04 17:15:15]

Clever. I hadn't thought of an obvious way to do this in GN.

+
     merge_action_name = target_name + "__jumbo_merge"
 
     # Create an action that calls a script that merges all the source files.
     action(merge_action_name) {
       script = "//build/config/merge_for_jumbo.py"
       response_file_contents =
           rebase_path(invoker.sources - excluded_sources, gen_target_dir)
       outputs = jumbo_files
       args = [ "--outputs" ] + rebase_path(outputs, root_build_dir) +
              [ "--file-list={{response_file_name}}" ]
@@ skipping 19 matching lines @@
 
     # Take everything else not handled above from the invoker.
     variables_to_not_forward = [ "deps" ]
     if (use_jumbo_build_for_target) {
       deps += [ ":" + merge_action_name ]
       variables_to_not_forward += [ "sources" ]
       assert(jumbo_files != [])
       sources = jumbo_files + excluded_sources
 
       # Need to keep the headers in sources so that dependency checks
-      # work, and we need to keep Objective-C code since they
-      # cannot be merged into a cc file (FIXME).
+      # work.
       foreach(source_file, invoker.sources) {
-        source_ext = get_path_info(source_file, "extension")
-        if (source_ext == "h" || source_ext == "mm") {
+        if (get_path_info(source_file, "extension") == "h") {
           sources += [ source_file ]
         }
       }
     }
     forward_variables_from(invoker, "*", variables_to_not_forward)
   }
 }
 
 set_defaults("jumbo_target") {
   # This sets the default list of configs when the content_source_set target
   # is defined. The default_compiler_configs comes from BUILDCONFIG.gn and
   # is the list normally applied to static libraries and source sets.
   configs = default_compiler_configs
 }