Fixup jumbo.gni (-Wno-subobject-linkage)

build/jumbo.gni

Index: build/jumbo.gni
diff --git a/build/jumbo.gni b/build/jumbo.gni
index 2a08bb9d2c68cef2c8a5b44b5adbd524fc9db3e9..6390fafcb931f9117069d7b5e1ec943e2ca51e95 100644
--- a/build/jumbo.gni
+++ b/build/jumbo.gni
@@ -77,6 +77,16 @@ template("jumbo_target") {
     variables_to_not_forward = [ "deps" ]
     if (use_jumbo_build) {
       deps += [ ":" + target_name + "_jumbo" ]
+
+      if (is_android && !is_clang) {
+        cflags = []
+        if (defined(invoker.cflags)) {
+          cflags += invoker.cflags
+        }
+        cflags += [ "-Wno-subobject-linkage" ]
+        variables_to_not_forward += [ "cflags" ]
+      }
+
       variables_to_not_forward += [ "sources" ]
       assert(jumbo_files != [])
       sources = jumbo_files + excluded_sources
@@ -87,6 +97,13 @@ template("jumbo_target") {
           sources += [ source_file ]
         }
       }
+
+      # Can't mix in Objective-C code in a cc file (FIXME).
+      foreach(source_file, invoker.sources) {
+        if (get_path_info(source_file, "extension") == "mm") {
+          sources += [ source_file ]
+        }
+      }
     }
     forward_variables_from(invoker, "*", variables_to_not_forward)
   }