[iOS] Simplify bundle creation by always calling codesign.py script.

build/config/ios/rules.gni

 # Copyright 2015 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/config/ios/ios_sdk.gni")
 import("//build/config/mac/base_rules.gni")
 import("//build/config/mac/symbols.gni")
 
 _is_fat_build = additional_toolchains != []
 if (_is_fat_build) {
   _is_fat_build_main_target = current_toolchain == default_toolchain
 }
 
-if (use_ios_simulator || ios_enable_code_signing) {
-  _default_entitlements_path = "//build/config/ios/entitlements.plist"
-}
+_code_signing_script_path = "//build/config/ios/codesign.py"
+_default_entitlements_path = "//build/config/ios/entitlements.plist"
 
 # Generates Info.plist files for Mac apps and frameworks.
 #
 # Arguments
 #
 #     info_plist:
 #         (optional) string, path to the Info.plist file that will be used for
 #         the bundle.
 #
 #     info_plist_target:
@@ skipping 202 matching lines @@
       }
       libs += [ "UIKit.framework" ]
     }
   } else {
     # This is either a thin build or the default toolchain of a fat-build.
     # The template will expand in many different target ($target_name is the
     # create_bundle target) used as input to the create_bundle target.
     _generate_info_plist = target_name + "_generate_info_plist"
     _bundle_data_info_plist = target_name + "_bundle_data_info_plist"
 
-    if (use_ios_simulator || ios_enable_code_signing) {
-      _entitlements_path = _default_entitlements_path
-      if (defined(invoker.entitlements_path)) {
-        _entitlements_path = invoker.entitlements_path
-      }
+    _entitlements_path = _default_entitlements_path
+    if (defined(invoker.entitlements_path)) {
+      _entitlements_path = invoker.entitlements_path
     }
 
     ios_info_plist(_generate_info_plist) {
       visibility = [ ":$_bundle_data_info_plist" ]
       if (use_ios_simulator) {
         visibility += [ ":$_generate_entitlements_target" ]
       }
       executable_name = _output_name
       forward_variables_from(invoker,
                              [
@@ skipping 14 matching lines @@
         ":$_generate_info_plist",
       ]
     }
 
     if (use_ios_simulator) {
       action(_generate_entitlements_target) {
         _gen_info_plist_target = ":$_generate_info_plist"
         _gen_info_plist_outputs = get_target_outputs(_gen_info_plist_target)
         _info_plist_path = _gen_info_plist_outputs[0]
 
-        script = "//build/config/ios/codesign.py"
+        script = _code_signing_script_path
         deps = [
           _gen_info_plist_target,
         ]
         sources = [
           _entitlements_path,
           _info_plist_path,
         ]
         outputs = [
           _generate_entitlements_output,
         ]
         args = [
                  "generate-entitlements",
                  "-e=" + rebase_path(_entitlements_path, root_build_dir),
                  "-p=" + rebase_path(_info_plist_path, root_build_dir),
                ] + rebase_path(outputs, root_build_dir)
       }
     }
 
     _link_executable = _target_name + "_executable"
-
-    if (ios_enable_code_signing) {
-      _link_executable_visibility = [ ":$_target_name" ]
-    } else {
-      _bundle_data_executable = target_name + "_bundle_data_executable"
-      _link_executable_visibility = [ ":$_bundle_data_executable" ]
-    }
+    _link_executable_visibility = [ ":$_target_name" ]
 
     # For a fat-build, the different "executable" outputs will be used to
     # create the final binary using "lipo". As the corresponding target has
     # the same role as the "executable" target in a thin build, copy the
     # visibility and redefine some variables.
     if (_is_fat_build) {
       _lipo_executable = _link_executable
       _lipo_executable_visibility = _link_executable_visibility
 
       _link_executable_visibility = []
@@ skipping 115 matching lines @@
               outputs += [ outputs[0] + ".unstripped" ]
               args += [ "-Wcrl,unstripped," +
                         rebase_path(get_path_info(outputs[0], "dir"),
                                     root_build_dir) ]
             }
           }
         }
       }
     }
 
-    if (!ios_enable_code_signing) {
-      # If codesigning is enabled, the binary will be copied into the bundle
-      # by the codesigning script (as the binary is updated by the signature).
-      # Otherwise, this "bundle_data" declares the location of the binary in
-      # the .app bundle.
-      bundle_data(_bundle_data_executable) {
-        forward_variables_from(invoker, [ "testonly" ])
-        visibility = [ ":$_target_name" ]
-        outputs = [
-          "{{bundle_executable_dir}}/$_output_name",
-        ]
-        if (_is_fat_build) {
-          public_deps = [
-            ":$_lipo_executable",
-          ]
-        } else {
-          public_deps = [
-            ":$_link_executable",
-          ]
-        }
-        sources = [
-          "$target_out_dir/$_output_name",
-        ]
-      }
-    }
-
-    if (!ios_enable_code_signing && defined(invoker.extra_system_frameworks)) {
-      bundle_data(_target_name + "_extra_system_frameworks") {
-        visibility = [ ":$_target_name" ]
-        sources = invoker.extra_system_frameworks
-        outputs = [
-          "{{bundle_resources_dir}}/Frameworks/{{source_file_part}}",
-        ]
-      }
-    }
-
     create_bundle(target_name) {
       forward_variables_from(invoker,
                              [
                                "data_deps",
                                "deps",
                                "public_deps",
                                "testonly",
                                "visibility",
                              ])
 
       if (!defined(deps)) {
         deps = []
       }
       deps += [ ":$_bundle_data_info_plist" ]
       if (!defined(public_deps)) {
         public_deps = []
       }
-      if (ios_enable_code_signing) {
-        if (_is_fat_build) {
-          public_deps += [ ":$_lipo_executable" ]
-        } else {
-          public_deps += [ ":$_link_executable" ]
-        }
+      if (_is_fat_build) {
+        public_deps += [ ":$_lipo_executable" ]
       } else {
-        public_deps += [ ":$_bundle_data_executable" ]
-        if (defined(invoker.extra_system_frameworks)) {
-          deps += [ ":${_target_name}_extra_system_frameworks" ]
-        }
+        public_deps += [ ":$_link_executable" ]
       }
       if (defined(invoker.bundle_deps)) {
         deps += invoker.bundle_deps
       }
 
       if (use_ios_simulator) {
         if (!defined(data_deps)) {
           data_deps = []
         }
         data_deps += [ "//testing/iossim" ]
       }
 
       if (defined(invoker.product_type)) {
         product_type = invoker.product_type
       } else {
         product_type = "com.apple.product-type.application"
       }
 
       if (defined(invoker.bundle_extension)) {
         _bundle_extension = invoker.bundle_extension
       } else {
         _bundle_extension = ".app"
       }
 
       bundle_root_dir = "$root_out_dir/$_output_name$_bundle_extension"
       bundle_resources_dir = bundle_root_dir
       bundle_executable_dir = bundle_root_dir
       bundle_plugins_dir = "$bundle_root_dir/PlugIns"
 
+      code_signing_script = _code_signing_script_path
+      code_signing_sources = [
+        _entitlements_path,
+        "$target_out_dir/$_output_name",
+      ]
+      code_signing_outputs = [ "$bundle_root_dir/$_output_name" ]
       if (ios_enable_code_signing) {
-        code_signing_script = "//build/config/ios/codesign.py"
-        code_signing_sources = [
-          _entitlements_path,
-          "$target_out_dir/$_output_name",
-        ]
-        code_signing_outputs = [
-          "$bundle_root_dir/$_output_name",
-          "$bundle_root_dir/_CodeSignature/CodeResources",
-        ]
-        if (ios_code_signing_identity != "") {
-          code_signing_outputs +=
-              [ "$bundle_root_dir/embedded.mobileprovision" ]
+        code_signing_outputs +=
+            [ "$bundle_root_dir/_CodeSignature/CodeResources" ]
+      }
+      if (ios_code_signing_identity != "") {
+        code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ]
+      }
+      if (defined(invoker.extra_system_frameworks)) {
+        foreach(_framework, invoker.extra_system_frameworks) {
+          code_signing_outputs += [ "$bundle_root_dir/Frameworks/" +
+                                    get_path_info(_framework, "file") ]
         }
-        if (defined(invoker.extra_system_frameworks)) {
-          foreach(_framework, invoker.extra_system_frameworks) {
-            code_signing_outputs += [ "$bundle_root_dir/Frameworks/" +
-                                      get_path_info(_framework, "file") ]
-          }
+      }
+      code_signing_args = [
+        "code-sign-bundle",
+        "-i=" + ios_code_signing_identity,
+        "-e=" + rebase_path(_entitlements_path, root_build_dir),
+        "-b=" + rebase_path("$target_out_dir/$_output_name", root_build_dir),
+        rebase_path(bundle_root_dir, root_build_dir),
+      ]
+      if (defined(invoker.extra_system_frameworks)) {
+        # All framework in extra_system_frameworks are expected to be
+        # system framework and the path to be already system absolute
+        # so do not use rebase_path here.
+        foreach(_framework, invoker.extra_system_frameworks) {
+          code_signing_args += [ "-F=" + _framework ]
         }
-        code_signing_args = [
-          "code-sign-bundle",
-          "-i=" + ios_code_signing_identity,
-          "-e=" + rebase_path(_entitlements_path, root_build_dir),
-          "-b=" + rebase_path("$target_out_dir/$_output_name", root_build_dir),
-          rebase_path(bundle_root_dir, root_build_dir),
-        ]
-        if (defined(invoker.extra_system_frameworks)) {
-          # All framework in extra_system_frameworks are expected to be
-          # system framework and the path to be already system absolute
-          # so do not use rebase_path here.
-          foreach(_framework, invoker.extra_system_frameworks) {
-            code_signing_args += [ "-F=" + _framework ]
-          }
-        }
+      }
+      if (!ios_enable_code_signing) {
+        code_signing_args += [ "--disable-code-signature" ]
       }
     }
   }
 
   # TODO(crbug.com/395883): ensure those variables are marked as used to
   # avoid errors while running "gn gen".
   if (defined(invoker.entitlements_path)) {
     assert(invoker.entitlements_path != "",
            "mark invoker.entitlements_path as used")
   }
@@ skipping 316 matching lines @@
   # that defines the real framework bundle (it will support the current cpu
   # as it is a fat framework).
 
   if (_is_fat_build && !_is_fat_build_main_target) {
     shared_library(_target_name) {
       forward_variables_from(invoker,
                              "*",
                              [
                                "assert_no_deps",
                                "bundle_deps",
-                               "code_signing_enabled",
                                "data_deps",
                                "info_plist",
                                "info_plist_target",
                                "output_name",
                              ])
       if (defined(visibility)) {
         visibility += [ ":${_target_name}_shared_library($default_toolchain)" ]
       }
       output_name = _output_name
       output_prefix_override = true
@@ skipping 101 matching lines @@
 
       config(_framework_headers_config) {
         # The link settings are inherited from the framework_bundle config.
         cflags = [
           "-F",
           rebase_path("$root_out_dir/.", root_build_dir),
         ]
       }
     }
 
-    _code_signing_enabled = ios_enable_code_signing
-    if (defined(invoker.code_signing_enabled)) {
-      _code_signing_enabled =
-          invoker.code_signing_enabled && _code_signing_enabled
-    }
-
     # 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"
     }
 
     _link_shared_library_target = target_name + "_shared_library"
     _shared_library_dir = "$target_out_dir/$_link_shared_library_target"
-
-    if (_code_signing_enabled) {
-      _link_shared_library_visibility = [ ":$_framework_target" ]
-    } else {
-      _shared_library_bundle_data = target_name + "_shared_library_bundle_data"
-      _link_shared_library_visibility = [ ":$_shared_library_bundle_data" ]
-    }
+    _link_shared_library_visibility = [ ":$_framework_target" ]
 
     if (_is_fat_build) {
       _lipo_shared_library_target = _link_shared_library_target
       _lipo_shared_library_visibility = _link_shared_library_visibility
 
       _link_shared_library_visibility = []
       _link_shared_library_visibility = [ ":$_lipo_shared_library_target" ]
       _link_shared_library_target = target_name + "_arch_shared_library"
 
       _arch_shared_library_dir = "$target_out_dir/$_link_shared_library_target"
       _shared_library_dir = "$target_out_dir/$_lipo_shared_library_target"
     }
 
     shared_library(_link_shared_library_target) {
       forward_variables_from(invoker,
                              "*",
                              [
                                "assert_no_deps",
                                "bundle_deps",
-                               "code_signing_enabled",
                                "data_deps",
                                "info_plist",
                                "info_plist_target",
                                "output_name",
                                "visibility",
                              ])
       visibility = _link_shared_library_visibility
       output_name = _output_name
       output_prefix_override = true
       output_extension = ""
@@ skipping 73 matching lines @@
               outputs += [ outputs[0] + ".unstripped" ]
               args += [ "-Wcrl,unstripped," +
                         rebase_path(get_path_info(outputs[0], "dir"),
                                     root_build_dir) ]
             }
           }
         }
       }
     }
 
-    if (!_code_signing_enabled) {
-      bundle_data(_shared_library_bundle_data) {
-        visibility = [ ":$_framework_target" ]
-        forward_variables_from(invoker, [ "testonly" ])
-        sources = [
-          "$_shared_library_dir/$_output_name",
-        ]
-        outputs = [
-          "{{bundle_executable_dir}}/$_output_name",
-        ]
-        if (_is_fat_build) {
-          public_deps = [
-            ":$_lipo_shared_library_target",
-          ]
-        } else {
-          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 ]
@@ skipping 49 matching lines @@
       }
       deps += [ ":$_info_plist_bundle" ]
 
       if (defined(invoker.bundle_deps)) {
         if (!defined(deps)) {
           deps = []
         }
         deps += invoker.bundle_deps
       }
 
-      if (!_code_signing_enabled) {
-        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 (_code_signing_enabled) {
-        if (!defined(deps)) {
-          deps = []
-        }
+      if (!defined(deps)) {
+        deps = []
+      }
 
-        if (_is_fat_build) {
-          deps += [ ":$_lipo_shared_library_target" ]
-        } else {
-          deps += [ ":$_link_shared_library_target" ]
-        }
+      if (_is_fat_build) {
+        deps += [ ":$_lipo_shared_library_target" ]
+      } else {
+        deps += [ ":$_link_shared_library_target" ]
+      }
 
-        _entitlements_path = _default_entitlements_path
-        if (defined(invoker.entitlements_path)) {
-          _entitlements_path = invoker.entitlements_path
-        }
+      _entitlements_path = _default_entitlements_path
+      if (defined(invoker.entitlements_path)) {
+        _entitlements_path = invoker.entitlements_path
+      }
 
-        code_signing_script = "//build/config/ios/codesign.py"
-        code_signing_sources = [
-          _entitlements_path,
-          "$_shared_library_dir/$_output_name",
-        ]
-        code_signing_outputs = [
-          "$bundle_root_dir/$_output_name",
-          "$bundle_root_dir/_CodeSignature/CodeResources",
-        ]
-        if (ios_code_signing_identity != "") {
-          code_signing_outputs +=
-              [ "$bundle_root_dir/embedded.mobileprovision" ]
-        }
-        code_signing_args = [
-          "code-sign-bundle",
-          "-i=" + ios_code_signing_identity,
-          "-e=" + rebase_path(_entitlements_path, root_build_dir),
-          "-b=" +
-              rebase_path("$_shared_library_dir/$_output_name", root_build_dir),
-          rebase_path(bundle_root_dir, root_build_dir),
-        ]
+      code_signing_script = _code_signing_script_path
+      code_signing_sources = [
+        _entitlements_path,
+        "$_shared_library_dir/$_output_name",
+      ]
+      code_signing_outputs = [ "$bundle_root_dir/$_output_name" ]
+      if (ios_enable_code_signing) {
+        code_signing_outputs +=
+            [ "$bundle_root_dir/_CodeSignature/CodeResources" ]
+      }
+      if (ios_code_signing_identity != "") {
+        code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ]
+      }
+      code_signing_args = [
+        "code-sign-bundle",
+        "-i=" + ios_code_signing_identity,
+        "-e=" + rebase_path(_entitlements_path, root_build_dir),
+        "-b=" +
+            rebase_path("$_shared_library_dir/$_output_name", root_build_dir),
+        rebase_path(bundle_root_dir, root_build_dir),
+      ]
+      if (!ios_enable_code_signing) {
+        code_signing_args += [ "--disable-code-signature" ]
       }
     }
 
     if (defined(_framework_version)) {
       action(_target_name) {
         forward_variables_from(invoker, [ "testonly" ])
 
         if (defined(invoker.visibility)) {
           visibility = invoker.visibility
           visibility += [ ":$_target_name+link" ]
@@ skipping 100 matching lines @@
       public_deps = [
         ":$_xctest_info_plist_target",
       ]
       sources = get_target_outputs(":$_xctest_info_plist_target")
       outputs = [
         "{{bundle_root_dir}}/Info.plist",
       ]
     }
 
     _xctest_loadable_module_target = _xctest_target + "_loadable_module"
-
-    if (!ios_enable_code_signing) {
-      _xctest_loadable_module_bundle =
-          _xctest_target + "_loadable_module_bundle"
-      _xctest_loadable_module_visibility =
-          [ ":$_xctest_loadable_module_bundle" ]
-    } else {
-      _xctest_loadable_module_visibility = [ ":$_xctest_target" ]
-    }
+    _xctest_loadable_module_visibility = [ ":$_xctest_target" ]
 
     if (_is_fat_build) {
       _xctest_lipo_loadable_module_target = _xctest_loadable_module_target
       _xctest_lipo_loadable_module_visibility =
           _xctest_loadable_module_visibility
 
       _xctest_loadable_module_visibility = []
       _xctest_loadable_module_visibility =
           [ ":$_xctest_lipo_loadable_module_target" ]
       _xctest_loadable_module_target = _xctest_target + "_arch_loadable_module"
@@ skipping 75 matching lines @@
               outputs += [ outputs[0] + ".unstripped" ]
               args += [ "-Wcrl,unstripped," +
                         rebase_path(get_path_info(outputs[0], "dir"),
                                     root_build_dir) ]
             }
           }
         }
       }
     }
 
-    if (!ios_enable_code_signing) {
-      bundle_data(_xctest_loadable_module_bundle) {
-        visibility = [ ":$_xctest_target" ]
-        if (_is_fat_build) {
-          public_deps = [
-            ":$_xctest_lipo_loadable_module_target",
-          ]
-        } else {
-          public_deps = [
-            ":$_xctest_loadable_module_target",
-          ]
-        }
-        sources = [
-          "$target_out_dir/$_xctest_output",
-        ]
-        outputs = [
-          "{{bundle_root_dir}}/$_xctest_output",
-        ]
-      }
-    }
-
     _xctest_bundle = _xctest_target + "_bundle"
 
     create_bundle(_xctest_target) {
       visibility = [ ":$_xctest_bundle" ]
       product_type = "com.apple.product-type.bundle.unit-test"
       deps = [
         ":$_xctest_info_plist_bundle",
       ]
       bundle_root_dir = "$root_out_dir/$_xctest_output.xctest"
 
+      if (_is_fat_build) {
+        deps += [ ":$_xctest_lipo_loadable_module_target" ]
+      } else {
+        deps += [ ":$_xctest_loadable_module_target" ]
+      }
+
+      _entitlements_path = _default_entitlements_path
+      if (defined(invoker.entitlements_path)) {
+        _entitlements_path = invoker.entitlements_path
+      }
+
+      code_signing_script = _code_signing_script_path
+      code_signing_sources = [
+        _entitlements_path,
+        "$target_out_dir/$_xctest_output",
+      ]
+      code_signing_outputs = [ "$bundle_root_dir/$_xctest_output" ]
+      if (ios_enable_code_signing) {
+        code_signing_outputs +=
+            [ "$bundle_root_dir/_CodeSignature/CodeResources" ]
+      }
+      if (ios_code_signing_identity != "") {
+        code_signing_outputs += [ "$bundle_root_dir/embedded.mobileprovision" ]
+      }
+      code_signing_args = [
+        "code-sign-bundle",
+        "-i=" + ios_code_signing_identity,
+        "-e=" + rebase_path(_entitlements_path, root_build_dir),
+        "-b=" + rebase_path("$target_out_dir/$_xctest_output", root_build_dir),
+        rebase_path(bundle_root_dir, root_build_dir),
+      ]
       if (!ios_enable_code_signing) {
-        deps += [ ":$_xctest_loadable_module_bundle" ]
-      } else {
-        if (_is_fat_build) {
-          deps += [ ":$_xctest_lipo_loadable_module_target" ]
-        } else {
-          deps += [ ":$_xctest_loadable_module_target" ]
-        }
-
-        _entitlements_path = _default_entitlements_path
-        if (defined(invoker.entitlements_path)) {
-          _entitlements_path = invoker.entitlements_path
-        }
-
-        code_signing_script = "//build/config/ios/codesign.py"
-        code_signing_sources = [
-          _entitlements_path,
-          "$target_out_dir/$_xctest_output",
-        ]
-        code_signing_outputs = [
-          "$bundle_root_dir/$_xctest_output",
-          "$bundle_root_dir/_CodeSignature/CodeResources",
-        ]
-        if (ios_code_signing_identity != "") {
-          code_signing_outputs +=
-              [ "$bundle_root_dir/embedded.mobileprovision" ]
-        }
-        code_signing_args = [
-          "code-sign-bundle",
-          "-i=" + ios_code_signing_identity,
-          "-e=" + rebase_path(_entitlements_path, root_build_dir),
-          "-b=" +
-              rebase_path("$target_out_dir/$_xctest_output", root_build_dir),
-          rebase_path(bundle_root_dir, root_build_dir),
-        ]
+        code_signing_args += [ "--disable-code-signature" ]
       }
     }
 
     bundle_data(_xctest_bundle) {
       visibility = [ ":$_host_target" ]
       public_deps = [
         ":$_xctest_target",
       ]
       sources = [
         "$root_out_dir/$_xctest_output.xctest",
@@ skipping 42 matching lines @@
       "-rpath",
       "-Xlinker",
       "@loader_path/Frameworks",
     ]
   }
 }
 
 set_defaults("ios_xctest_test") {
   configs = default_executable_configs
 }