Commit c71f8f10 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'backlog_4903-all-upstreamBrowser' into 'master'

Upstream Browser and BrowserWebView to Bromite v96.0.4664.183

See merge request e/apps/browser!41
parents 33c7cb88 77b80259
Pipeline #164155 passed with stages
in 435 minutes and 17 seconds
bromite @ 0b2a41b2
Subproject commit 5b6a7442e0c41d682efd0670755240f08563225a
Subproject commit 0b2a41b2af91b8e237e761a5690dd6734674b7a8
From 9191f8e182bf92e882e9995e712960893f7a5b99 Mon Sep 17 00:00:00 2001
From 009e3ecb9fae3ff95cf8b9f02ca045093a2526fc Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 05:39:25 +0000
Subject: [PATCH] Browser: Change app and package name to browser
......@@ -10,15 +10,15 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d440e71a0d886..0cb4718753fe7 100644
index 710985b89777b..211eeded4a74e 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -44,16 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
@@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
assert(current_toolchain != android_secondary_abi_toolchain)
}
-_default_package = "org.chromium.chrome"
-if (android_channel != "default") {
-_default_package = "org.bromite.bromite"
-if (android_channel != "default" && android_channel != "stable") {
- # android-binary-size trybot may checks if an internal Chrome variant's
- # AndroidManifest is as expected by ensuring the differences between its
- # AndroidManifest and its upstream target's .AndroidManifest.expected file
......@@ -31,7 +31,7 @@ index d440e71a0d886..0cb4718753fe7 100644
declare_args() {
# Android package name to use when compiling the public chrome targets
@@ -65,7 +56,7 @@ declare_args() {
@@ -64,7 +55,7 @@ declare_args() {
# for details.
chrome_public_manifest_package = _default_package
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment