[Mac/GN] Re-do framework packaging to fix framework versioning.

chrome/BUILD.gn

 # Copyright 2014 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/buildflag_header.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 438 matching lines @@
       "app/firstRun",
     ]
     outputs = [
       "$root_out_dir/First Run",
     ]
   }
 } else if (is_mac) {
   chrome_helper_name = chrome_product_full_name + " Helper"
   chrome_framework_name = chrome_product_full_name + " Framework"
 
+  if (enable_xpc_notifications) {
+    chrome_framework_version = "A"
+  }
+
   group("chrome") {
     deps = [
       ":chrome_app",
     ]
 
     data_deps = [
       ":chrome_app",
     ]
 
     if (debug_devtools) {
@@ skipping 526 matching lines @@
     if (enable_package_mash_services) {
       deps += [ "//chrome/app/mash" ]
     }
 
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
   }
 
   mac_framework_bundle("chrome_framework") {
     output_name = chrome_framework_name
 
-    if (enable_xpc_notifications) {
-      framework_version = "A"
+    if (defined(chrome_framework_version)) {
+      framework_version = chrome_framework_version
+      framework_contents = [
+        "Helpers",
+        "Resources",
+      ]
+
+      if (enable_xpc_notifications) {
+        framework_contents += [ "XPCServices" ]
+      }
     }
 
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
     info_plist_target = ":chrome_framework_plist"
     extra_substitutions = [
       "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
       "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
     ]
 
@@ skipping 52 matching lines @@
       args = [
         "--stamp",
         rebase_path(stamp_file, root_out_dir),
       ]
       if (!use_system_xcode) {
         args += [
           "--developer_dir",
           hermetic_xcode_path,
         ]
       }
+
+      _framework_path = "$root_out_dir/$chrome_framework_name.framework/"
+      if (defined(chrome_framework_version)) {
+        _framework_path +=
+            "Versions/$chrome_framework_version/$chrome_framework_name"
+      } else {
+        _framework_path += "$chrome_framework_name"
+      }
       args += [
         "_ChromeMain",
-        rebase_path(
-            "$root_out_dir/$chrome_framework_name.framework/$chrome_framework_name",
-            root_out_dir),
+        rebase_path(_framework_path, root_out_dir),
       ]
       outputs = [
         stamp_file,
       ]
       public_deps = [
         ":chrome_framework",
       ]
     }
   } else {
     group("verify_chrome_framework_order") {
@@ skipping 479 matching lines @@
       "//chrome/app/theme/$branding_path_component/product_logo_48.png",
       "//chrome/tools/build/linux/chrome-wrapper",
       "//third_party/xdg-utils/scripts/xdg-mime",
       "//third_party/xdg-utils/scripts/xdg-settings",
     ]
     outputs = [
       "$root_out_dir/{{source_file_part}}",
     ]
   }
 }