Enable generation of PkgInfo for all application on iOS.

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")
 import("//build/toolchain/toolchain.gni")
 
 # Invokes lipo on multiple arch-specific binaries to create a fat binary.
@@ skipping 402 matching lines @@
 #       default to ios_enable_code_signing if not defined.
 #
 # For more information, see "gn help executable".
 template("ios_app_bundle") {
   _output_name = target_name
   _target_name = target_name
   if (defined(invoker.output_name)) {
     _output_name = invoker.output_name
   }
 
-  # TODO(sdefresne): some target downstream manually pack an PkgInfo, so
-  # allow controlling the generation of the PkgInfo file via an undocumented
-  # parameter until they are fixed.
-  _write_pkg_info = false
   if (defined(invoker.write_pkg_info)) {
-    _write_pkg_info = invoker.write_pkg_info
+    # TODO(sdefresne): remove once all downstream target have been fixed to
+    # not override this variable anymore.
+    assert(invoker.write_pkg_info, "write_pkg_info cannot be overridden")
   }
 
-  assert(_write_pkg_info || !_write_pkg_info,
-         "prevents 'Assignment had no effect.' errors")
-
   _arch_executable_source = _target_name + "_arch_executable_sources"
   _arch_executable_target = _target_name + "_arch_executable"
   _lipo_executable_target = _target_name + "_executable"
 
   source_set(_arch_executable_source) {
     forward_variables_from(invoker,
                            "*",
                            [
                              "bundle_deps",
                              "bundle_deps_filter",
@@ skipping 194 matching lines @@
 
       sources = get_target_outputs(":$_generate_info_plist")
       outputs = [
         "{{bundle_root_dir}}/Info.plist",
       ]
       public_deps = [
         ":$_generate_info_plist",
       ]
     }
 
+    _app_product_type = "com.apple.product-type.application"
+    _product_type = _app_product_type
+    if (defined(invoker.product_type)) {
+      _product_type = invoker.product_type
+    }
+
+    _app_bundle_extension = ".app"
+    _bundle_extension = _app_bundle_extension
+    if (defined(invoker.bundle_extension)) {
+      _bundle_extension = invoker.bundle_extension
+    }
+
+    # Only write PkgInfo for real application, not application extension (they
+    # have the same product type but a different extension).
+    _write_pkg_info = _product_type == _app_product_type &&
+                      _bundle_extension == _app_bundle_extension
+
     if (_write_pkg_info) {
       _create_pkg_info = target_name + "_pkg_info"
       action(_create_pkg_info) {
         forward_variables_from(invoker, [ "testonly" ])
         script = "//build/config/mac/write_pkg_info.py"
         sources = get_target_outputs(":$_generate_info_plist")
         outputs = [
           "$target_gen_dir/$target_name",
         ]
         args = [ "--plist" ] + rebase_path(sources, root_build_dir) +
@@ skipping 14 matching lines @@
           ":$_create_pkg_info",
         ]
       }
     }
 
     create_signed_bundle(_target_name) {
       forward_variables_from(invoker,
                              [
                                "bundle_deps",
                                "bundle_deps_filter",
-                               "bundle_extension",
                                "data_deps",
                                "deps",
                                "enable_code_signing",
                                "entitlements_path",
                                "entitlements_target",
                                "extra_system_frameworks",
-                               "product_type",
                                "public_configs",
                                "public_deps",
                                "testonly",
                                "visibility",
                              ])
 
       output_name = _output_name
       bundle_binary_target = ":$_lipo_executable_target"
       bundle_binary_output = _output_name
+      bundle_extension = _bundle_extension
+      product_type = _product_type
 
       if (!defined(bundle_deps)) {
         bundle_deps = []
       }
       bundle_deps += [ ":$_bundle_data_info_plist" ]
       if (_write_pkg_info) {
         bundle_deps += [ ":$_bundle_data_pkg_info" ]
       }
 
       if (use_ios_simulator) {
         if (!defined(data_deps)) {
           data_deps = []
         }
         data_deps += [ "//testing/iossim" ]
       }
-
-      if (!defined(product_type)) {
-        product_type = "com.apple.product-type.application"
-      }
-
-      if (!defined(bundle_extension)) {
-        bundle_extension = ".app"
-      }
     }
   }
 }
 
 set_defaults("ios_app_bundle") {
   configs = default_executable_configs
 }
 
 # Template to build an application extension bundle for iOS.
 #
@@ skipping 724 matching lines @@
       "-rpath",
       "-Xlinker",
       "@loader_path/Frameworks",
     ]
   }
 }
 
 set_defaults("ios_xctest_test") {
   configs = default_executable_configs
 }