commit cb4cd07289a0b38bb46a91701a7d42b65645dff8
author Sen Jiang <senj@google.com> Thu Jun 23 21:54:37 2022 +0000
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 23 21:54:37 2022 +0000
tree 109eaa5163a93ae596b97851f96e33d1f0989f8f
parent 8552d67478671de5d4eee58175b9745b2649fe23

[chrome] Change chrome package repo to chromium.org

Also moved chrome to cache packages for user/userdebug build.

Bug: 98784
Change-Id: Ia8399ffdd51d4f1e166521f853d4170c43762aa4
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/687688
Reviewed-by: Aaron Wood <aaronwood@google.com>
Reviewed-by: David Dorwin <ddorwin@google.com>
Commit-Queue: Sen Jiang <senj@google.com>

build/packages/prebuilt_package_with_flavors.gni

diff --git a/build/packages/prebuilt_package_with_flavors.gni b/build/packages/prebuilt_package_with_flavors.gni
index 07b93f9..641e3dd 100644
--- a/build/packages/prebuilt_package_with_flavors.gni
+++ b/build/packages/prebuilt_package_with_flavors.gni
@@ -171,6 +171,7 @@
                              "testonly",
                              "visibility",
                              "package_name",
+                             "repository",
                            ])
 
     # setup the non-production-safe status of the package

products/common/workstation.gni

diff --git a/products/common/workstation.gni b/products/common/workstation.gni
index de6234a..807287e 100644
--- a/products/common/workstation.gni
+++ b/products/common/workstation.gni
@@ -71,6 +71,8 @@
   # TODO(fxbug.dev/79542): Demote to universe when sysui handles pairing+connecting
   "//src/connectivity/bluetooth/tools/bt-cli",
   "//src/connectivity/bluetooth/tools/bt-pairing-tool",
+
+  "//src/chromium:chrome_browser",
 ]
 
 # Explicitly prefer wired networking on workstation
@@ -84,7 +86,6 @@
     [ "//src/connectivity/network:network-legacy-deprecated" ]
 
 legacy_base_package_labels += [
-  "//src/chromium:chrome_browser",
   "//src/experiences/bin/settings/license:license_settings",
   "//src/experiences/session_shells/ermine",
   "//src/media/playback/bundles:services",

products/workstation_eng.gni

diff --git a/products/workstation_eng.gni b/products/workstation_eng.gni
index 2c03511..793caf4 100644
--- a/products/workstation_eng.gni
+++ b/products/workstation_eng.gni
@@ -34,7 +34,6 @@
   "//src/ui/bin/brightness_manager",
   "//src/ui/bin/screensaver",
   "//src/ui/bin/shortcut",
-  "//src/chromium:chrome_browser",
   "//src/experiences/bin/settings/license:license_settings",
   "//src/experiences/session_shells/ermine",
   "//src/media/playback/bundles:services",

src/chromium/generate_chromium_targets.gni

diff --git a/src/chromium/generate_chromium_targets.gni b/src/chromium/generate_chromium_targets.gni
index 7f2f582..c3a0ecc 100644
--- a/src/chromium/generate_chromium_targets.gni
+++ b/src/chromium/generate_chromium_targets.gni
@@ -163,6 +163,7 @@
     generate_package_flavors("chrome_browser") {
       prebuilt_archive_base_path = "${prebuilt_archive_root_path}/chrome"
       package_name = "chrome"
+      repository = "chromium.org"
       custom_package_path =
           "${build_output_gen_base_path}/chrome/app/chrome/chrome.far"
       selections = package_flavor_selections

src/chromium/generate_pkg_and_config.gni

diff --git a/src/chromium/generate_pkg_and_config.gni b/src/chromium/generate_pkg_and_config.gni
index 54fdcad..a747725 100644
--- a/src/chromium/generate_pkg_and_config.gni
+++ b/src/chromium/generate_pkg_and_config.gni
@@ -43,6 +43,7 @@
                              "testonly",
                              "visibility",
                              "package_name",
+                             "repository",
                            ])
 
     if (defined(invoker.package_name)) {
@@ -100,6 +101,7 @@
                              "prebuilt_archive_base_path",
                              "selections",
                              "testonly",
+                             "repository",
                            ])
   }
   generate_config(target_name) {