Refactor code signing script and template.

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")
 
-_toolchain_suffix = ""
 _is_fat_build = additional_toolchains != []
 if (_is_fat_build) {
-  _toolchain_suffix = "($default_toolchain)"
   _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"
+}
+
 # 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:
 #         (optional) string, if the info_plist is generated from an action,
@@ skipping 127 matching lines @@
   # The rest of the build, including the codesigning step, are the same for
   # thin and fat builds.
 
   _executable_extra_deps = []
   _executable_extra_inputs = []
   _executable_extra_ldflags = []
 
   # Embeds the entitlements file if building for simulator. This is optional
   # with Xcode 7 or older but required with Xcode 8. This is not necessary for
   # device build as the entitlement is embedded via the codesigning step.
-  #
-  # As the generation of the entitlement depends on the
   if (use_ios_simulator) {
     _generate_entitlements_target = _target_name + "_gen_entitlements"
     _generate_entitlements_target_with_toolchain_suffix =
-        "$_generate_entitlements_target$_toolchain_suffix"
+        "$_generate_entitlements_target($default_toolchain)"
 
     _generate_entitlements_output =
         get_label_info(_generate_entitlements_target_with_toolchain_suffix,
                        "target_gen_dir") + "/$_output_name.xcent"
 
     _executable_extra_inputs += [ _generate_entitlements_output ]
     _executable_extra_deps +=
         [ ":$_generate_entitlements_target_with_toolchain_suffix" ]
     _executable_extra_ldflags += [
       "-Xlinker",
@@ skipping 51 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 = "//build/config/ios/entitlements.plist"
+      _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" ]
       }
@@ skipping 29 matching lines @@
           _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),
-                 "generate-entitlements",
                  "-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 {
@@ skipping 230 matching lines @@
 
       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",
-          "$bundle_root_dir/embedded.mobileprovision",
         ]
+        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") ]
           }
         }
         code_signing_args = [
-          "-e=" + rebase_path(_entitlements_path, root_build_dir),
           "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 ]
           }
@@ skipping 343 matching lines @@
       if (defined(visibility)) {
         visibility += [ ":${_target_name}_shared_library($default_toolchain)" ]
       }
       output_name = _output_name
       output_prefix_override = true
       output_extension = ""
       output_dir = "$target_out_dir/$_target_name"
 
       if (_has_public_headers) {
         configs += [
-          ":$_framework_headers_config$_toolchain_suffix",
-          ":$_headers_map_config$_toolchain_suffix",
+          ":$_framework_headers_config($default_toolchain)",
+          ":$_headers_map_config($default_toolchain)",
         ]
 
         if (!defined(deps)) {
           deps = []
         }
-        deps += [ ":$_framework_headers_target$_toolchain_suffix" ]
+        deps += [ ":$_framework_headers_target($default_toolchain)" ]
       }
     }
 
     group(_target_name + "+link") {
       forward_variables_from(invoker,
                              [
                                "visibility",
                                "testonly",
                              ])
       public_deps = [
@@ skipping 144 matching lines @@
       output_prefix_override = true
       output_extension = ""
 
       if (!_is_fat_build) {
         output_dir = _shared_library_dir
       } else {
         output_dir = _arch_shared_library_dir
       }
 
       if (_has_public_headers) {
-        configs += [ ":$_headers_map_config$_toolchain_suffix" ]
+        configs += [ ":$_headers_map_config($default_toolchain)" ]
 
         if (!defined(deps)) {
           deps = []
         }
-        deps += [ ":$_framework_headers_target$_toolchain_suffix" ]
+        deps += [ ":$_framework_headers_target($default_toolchain)" ]
       }
     }
 
     if (_is_fat_build) {
       action(_lipo_shared_library_target) {
         forward_variables_from(invoker, [ "testonly" ])
         visibility = _lipo_shared_library_visibility
         script = "//build/toolchain/mac/linker_driver.py"
         outputs = [
           "$_shared_library_dir/$_output_name",
@@ skipping 162 matching lines @@
         if (!defined(deps)) {
           deps = []
         }
 
         if (_is_fat_build) {
           deps += [ ":$_lipo_shared_library_target" ]
         } else {
           deps += [ ":$_link_shared_library_target" ]
         }
 
-        _entitlements_path = "//build/config/ios/entitlements.plist"
+        _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",
-          "$bundle_root_dir/embedded.mobileprovision",
         ]
+        if (ios_code_signing_identity != "") {
+          code_signing_outputs +=
+              [ "$bundle_root_dir/embedded.mobileprovision" ]
+        }
         code_signing_args = [
-          "-e=" + rebase_path(_entitlements_path, root_build_dir),
           "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 (defined(_framework_version)) {
       action(_target_name) {
         forward_variables_from(invoker, [ "testonly" ])
@@ skipping 248 matching lines @@
 
       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 = "//build/config/ios/entitlements.plist"
+        _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",
-          "$bundle_root_dir/embedded.mobileprovision",
         ]
+        if (ios_code_signing_identity != "") {
+          code_signing_outputs +=
+              [ "$bundle_root_dir/embedded.mobileprovision" ]
+        }
         code_signing_args = [
-          "-e=" + rebase_path(_entitlements_path, root_build_dir),
           "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),
         ]
       }
     }
 
     bundle_data(_xctest_bundle) {
       visibility = [ ":$_host_target" ]
       public_deps = [
@@ skipping 46 matching lines @@
       "-rpath",
       "-Xlinker",
       "@loader_path/Frameworks",
     ]
   }
 }
 
 set_defaults("ios_xctest_test") {
   configs = default_executable_configs
 }