Keep ios_app_bundle final executable target name unchanged in fat builds.

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")
 
 # Generates Info.plist files for Mac apps and frameworks.
 #
@@ skipping 193 matching lines @@
       forward_variables_from(invoker, [ "testonly" ])
       sources = get_target_outputs(":$_generate_info_plist")
       outputs = [
         "{{bundle_root_dir}}/Info.plist",
       ]
       public_deps = [
         ":$_generate_info_plist",
       ]
     }
 
-    _link_executable = _target_name + "_link_executable"
+    _link_executable = _target_name + "_executable"
     _executable_path = "$target_out_dir/$_output_name"
 
     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" ]
     }
 
     # 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 = _target_name + "_lipo_executable"
+      _lipo_executable = _link_executable
       _lipo_executable_visibility = _link_executable_visibility
 
       _link_executable_visibility = []
       _link_executable_visibility = [ ":$_lipo_executable" ]
+      _link_executable = _target_name + "_arch_executable"
 
       _arch_executable_path = "$target_out_dir/$current_cpu/$_output_name"
     }
 
     executable(_link_executable) {
       forward_variables_from(invoker,
                              "*",
                              [
                                "bundle_extension",
                                "data_deps",
@@ skipping 604 matching lines @@
       public_deps = [
         ":$_framework_target+link$_toolchain_suffix",
       ]
     }
   }
 }
 
 set_defaults("ios_framework_bundle") {
   configs = default_shared_library_configs
 }