Add support for fat build to "ios_framework_bundle" target.

build/config/mac/base_rules.gni

Index: build/config/mac/base_rules.gni
diff --git a/build/config/mac/base_rules.gni b/build/config/mac/base_rules.gni
index df89c404df57061f0654a1e69fefad12c1e8b605..fac4fe643c7cb1ed88c751bbb0d6868f75d8df81 100644
--- a/build/config/mac/base_rules.gni
+++ b/build/config/mac/base_rules.gni
@@ -218,125 +218,222 @@ template("framework_bundle") {
     _output_name = invoker.output_name
   }
 
-  # If the framework is unversioned, the final _target_name will be the
-  # create_bundle(_framework_target), otherwise an action with the name
-  # _target_name will depends on the the create_bundle() in order to prepare
-  # the versioned directory structure.
-  _framework_target = _target_name
-  _framework_name = _output_name + ".framework"
-  _framework_root_dir = "$root_out_dir/$_framework_name"
-  if (defined(invoker.framework_version) && invoker.framework_version != "") {
-    _framework_version = invoker.framework_version
-    _framework_root_dir += "/Versions/$_framework_version"
-    _framework_target = _target_name + "_create_bundle"
+  _is_fat_build = is_ios && additional_toolchains != []
+  if (_is_fat_build) {
+    _is_fat_build_main_target = current_toolchain == default_toolchain
   }
 
-  _shared_library_target = target_name + "_shared_library"
-  _shared_library_bundle_data = _shared_library_target + "_bundle_data"
+  # The expansion of the template is different for fat and thin builds. For
+  # thin build (and default toolchain of a fat build), the template expands
+  # to a "shared_library" target to create the bundle shared library and a
+  # "create_bundle" target (the main target) to create the bundle structure.
+  #
+  # For a fat build, the template just expands to the "shared_library" target
+  # for the non-default toolchain, while the final library is created using
+  # "lipo" in the expansion of the template for the default toolchain.
+  #
+  # The "$target_name+link" group for the non-default toolchain depends on the
+  # target of the same name from the default toolchain as this is the target
+  # that defines the real framework bundle (it will support the current cpu
+  # as it is a fat framework).
 
-  shared_library(_shared_library_target) {
-    visibility = [ ":$_shared_library_bundle_data" ]
-    forward_variables_from(invoker,
-                           "*",
-                           [
-                             "assert_no_deps",
-                             "data_deps",
-                             "info_plist",
-                             "output_name",
-                             "visibility",
-                           ])
-    output_name = _output_name
-    output_prefix_override = true
-    output_extension = ""
-    output_dir = "$target_out_dir/$_shared_library_target"
-  }
+  if (_is_fat_build && !_is_fat_build_main_target) {
+    shared_library(_target_name) {
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "assert_no_deps",
+                               "data_deps",
+                               "info_plist",
+                               "output_name",
+                             ])
+      if (defined(visibility)) {
+        visibility += [ ":*($default_toolchain)" ]

[Robert Sesek, 2016/07/12 23:57:16]

Why :* here? Can't this be limited to the _lipo_shared_library_target? (And
can't you ignore any invoker visibility?)

[sdefresne, 2016/07/13 10:57:50]

I cannot ignore the invoker visibility because this break non-default toolchain
when doing fat builds. Changed to allow just _lipo_shared_library_target.

+      }
+      output_name = _output_name
+      output_prefix_override = true
+      output_extension = ""
+      output_dir = "$target_out_dir/$_target_name"
+    }
 
-  bundle_data(_shared_library_bundle_data) {
-    visibility = [ ":$_framework_target" ]
-    forward_variables_from(invoker, [ "testonly" ])
-    sources = [
-      "$target_out_dir/$_shared_library_target/$_output_name",
-    ]
-    outputs = [
-      "{{bundle_executable_dir}}/$_output_name",
-    ]
-    public_deps = [
-      ":$_shared_library_target",
-    ]
-  }
+    group(_target_name + "+link") {
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "testonly",
+                             ])
+      public_deps = [
+        ":$_target_name($default_toolchain)",
+      ]
+    }
+  } else {
+    # If the framework is unversioned, the final _target_name will be the
+    # create_bundle(_framework_target), otherwise an action with the name
+    # _target_name will depends on the the create_bundle() in order to prepare
+    # the versioned directory structure.
+    _framework_target = _target_name
+    _framework_name = _output_name + ".framework"
+    _framework_root_dir = "$root_out_dir/$_framework_name"
+    if (defined(invoker.framework_version) && invoker.framework_version != "") {
+      _framework_version = invoker.framework_version
+      _framework_root_dir += "/Versions/$_framework_version"
+      _framework_target = _target_name + "_create_bundle"
+    }
 
-  _framework_public_config = _target_name + "_public_config"
-  config(_framework_public_config) {
-    # TODO(sdefresne): should we have a framework_dirs similar to lib_dirs
-    # and include_dirs to avoid duplicate values on the command-line.
-    visibility = [ ":$_framework_target" ]
-    ldflags = [ "-F" + rebase_path("$root_out_dir/.", root_build_dir) ]
-    lib_dirs = [ root_out_dir ]
-    libs = [ _framework_name ]
-  }
+    _link_shared_library_target = target_name + "_link_shared_library"
+    _shared_library_bundle_data = target_name + "_shared_library_bundle_data"
+    _link_shared_library_visibility = [ ":$_shared_library_bundle_data" ]
 
-  create_bundle(_framework_target) {
-    forward_variables_from(invoker,
-                           [
-                             "data_deps",
-                             "deps",
-                             "public_deps",
-                             "testonly",
-                           ])
+    if (_is_fat_build) {
+      _lipo_shared_library_target = target_name + "_lipo_shared_library"
+      _lipo_shared_library_visibility = _link_shared_library_visibility
 
-    if (defined(_framework_version)) {
-      visibility = [ ":$_target_name" ]
-    } else {
-      if (defined(invoker.visibility)) {
-        visibility = invoker.visibility
-        visibility += [ ":$_target_name+link" ]
-      }
+      _link_shared_library_visibility = []

[Robert Sesek, 2016/07/12 23:57:16]

Remove

[sdefresne, 2016/07/13 10:57:50]

I can't as "gn" complain with the following error:

ERROR at //build/config/mac/base_rules.gni:292:7: Replacing nonempty list.
      _link_shared_library_visibility = [ ":$_lipo_shared_library_target" ]
      ^------------------------------
This overwrites a previously-defined nonempty list (length 1).
See //build/config/mac/base_rules.gni:285:39: for previous definition
    _link_shared_library_visibility = [ ":$_shared_library_bundle_data" ]
                                      ^---------------------------------
with another one (length 1). Did you mean "+=" to append instead? If you
really want to do this, do
  _link_shared_library_visibility = []
before reassigning.

Since my goal is to replace the list, I have to do the empty list assignment
first.

[Robert Sesek, 2016/07/13 20:27:54]

Acknowledged.

+      _link_shared_library_visibility = [ ":$_lipo_shared_library_target" ]
     }
 
-    if (!defined(public_deps)) {
-      public_deps = []
+    shared_library(_link_shared_library_target) {
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "assert_no_deps",
+                               "data_deps",
+                               "info_plist",
+                               "output_name",
+                               "visibility",
+                             ])
+      visibility = _link_shared_library_visibility
+      output_name = _output_name
+      output_prefix_override = true
+      output_extension = ""
+      output_dir = "$target_out_dir/$_link_shared_library_target"
     }
-    public_deps += [ ":$_shared_library_bundle_data" ]
 
-    bundle_root_dir = _framework_root_dir
-    bundle_resources_dir = "$bundle_root_dir/Resources"
-    bundle_executable_dir = "$bundle_root_dir"
-  }
+    if (_is_fat_build) {
+      action(_lipo_shared_library_target) {
+        forward_variables_from(invoker, [ "testonly" ])
+        visibility = _lipo_shared_library_visibility
+        script = "//build/config/mac/xcrun.py"
+        outputs = [
+          "$target_out_dir/$_lipo_shared_library_target/$_output_name",
+        ]
+        inputs = [
+          "$target_out_dir/$_link_shared_library_target/$_output_name",
+        ]
+        deps = [
+          ":$_link_shared_library_target",
+        ]
+        foreach(_additional_toolchain, additional_toolchains) {
+          _additional_toolchain_target = "$_target_name($_additional_toolchain)"
+          deps += [ ":$_additional_toolchain_target" ]
+          inputs += [ get_label_info(_additional_toolchain_target,
+                                     "target_out_dir") + "/$_output_name" ]
+        }
+        args = [
+                 "lipo",
+                 "-create",
+                 "-output",
+                 rebase_path(outputs[0], root_build_dir),
+               ] + rebase_path(inputs, root_build_dir)
+      }
+    }
 
-  if (defined(_framework_version)) {
-    action(_target_name) {
+    bundle_data(_shared_library_bundle_data) {
+      visibility = [ ":$_framework_target" ]
       forward_variables_from(invoker, [ "testonly" ])
+      outputs = [
+        "{{bundle_executable_dir}}/$_output_name",
+      ]
+      if (_is_fat_build) {
+        sources = [
+          "$target_out_dir/$_lipo_shared_library_target/$_output_name",
+        ]
+        public_deps = [
+          ":$_lipo_shared_library_target",
+        ]
+      } else {
+        sources = [
+          "$target_out_dir/$_link_shared_library_target/$_output_name",
+        ]
+        public_deps = [
+          ":$_link_shared_library_target",
+        ]
+      }
+    }
+
+    _framework_public_config = _target_name + "_public_config"
+    config(_framework_public_config) {
+      # TODO(sdefresne): should we have a framework_dirs similar to lib_dirs
+      # and include_dirs to avoid duplicate values on the command-line.
+      visibility = [ ":$_framework_target" ]
+      ldflags = [ "-F" + rebase_path("$root_out_dir/.", root_build_dir) ]
+      lib_dirs = [ root_out_dir ]
+      libs = [ _framework_name ]
+    }
+
+    create_bundle(_framework_target) {
+      forward_variables_from(invoker,
+                             [
+                               "data_deps",
+                               "deps",
+                               "public_deps",
+                               "testonly",
+                             ])
 
-      if (defined(invoker.visibility)) {
-        visibility = invoker.visibility
-        visibility += [ ":$_target_name+link" ]
+      if (defined(_framework_version)) {
+        visibility = [ ":$_target_name" ]
+      } else {
+        if (defined(invoker.visibility)) {
+          visibility = invoker.visibility
+          visibility += [ ":$_target_name+link" ]
+        }
       }
 
-      script = "//build/config/mac/package_framework.py"
-      outputs = [
-        "$root_out_dir/$_framework_name/Versions/Current",
-      ]
-      args = [
-        "$_framework_name",
-        "$_framework_version",
-      ]
+      if (!defined(public_deps)) {
+        public_deps = []
+      }
+      public_deps += [ ":$_shared_library_bundle_data" ]
+
+      bundle_root_dir = _framework_root_dir
+      bundle_resources_dir = "$bundle_root_dir/Resources"
+      bundle_executable_dir = "$bundle_root_dir"
+    }
+
+    if (defined(_framework_version)) {
+      action(_target_name) {
+        forward_variables_from(invoker, [ "testonly" ])
+
+        if (defined(invoker.visibility)) {
+          visibility = invoker.visibility
+          visibility += [ ":$_target_name+link" ]
+        }
+
+        script = "//build/config/mac/package_framework.py"
+        outputs = [
+          "$root_out_dir/$_framework_name/Versions/Current",
+        ]
+        args = [
+          "$_framework_name",
+          "$_framework_version",
+        ]
+        public_deps = [
+          ":$_framework_target",
+        ]
+      }
+    }
+
+    group(_target_name + "+link") {
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "testonly",
+                             ])
       public_deps = [
-        ":$_framework_target",
+        ":$_target_name",
       ]
+      public_configs = [ ":$_framework_public_config" ]
     }
   }
-
-  group(_target_name + "+link") {
-    forward_variables_from(invoker,
-                           [
-                             "visibility",
-                             "testonly",
-                           ])
-    public_deps = [
-      ":$_target_name",
-    ]
-    public_configs = [ ":$_framework_public_config" ]
-  }
 }
 
 # Template to combile .xib or .storyboard files.