Commit 33c7cb88 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'backlog_3718-all-upstreamBrowserRebase' into 'master'

Upstream Browser and BrowserWebView to Bromite v96.0.4664.54

See merge request e/apps/browser!40
parents 9a6cae86 fb5b5ff1
Pipeline #151365 passed with stages
in 527 minutes and 21 seconds
......@@ -7,6 +7,7 @@ stages:
variables:
CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH
GIT_SUBMODULE_STRATEGY: recursive
build-docker:
image: docker:19-git
......@@ -18,7 +19,7 @@ build-docker:
services:
- docker:19-dind
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.e.foundation:5000
- echo "$CI_JOB_TOKEN" | docker login registry.gitlab.e.foundation:5000 -u gitlab-ci-token --password-stdin
- docker pull $CONTAINER_IMAGE:latest || true
- docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:latest ${CI_PROJECT_DIR}
- docker push $CONTAINER_IMAGE:latest
......
[submodule "bromite"]
path = bromite
url = https://github.com/bromite/bromite/
Specific authors for Browser, the /e/ fork of Chromium/Bromite:
© ECORP SAS 2019 - Author: Romain Hunault
Note: original authors are not listed here. Please refer to the source code of the original project and/or the commit history for the complete list of authors.
\ No newline at end of file
This diff is collapsed.
......@@ -5,6 +5,14 @@ ENV PATH "$PATH:${DEPOT_TOOLS}"
ENV CHROMIUM_DIR "/srv/chromium"
ENV DEBIAN_FRONTEND noninteractive
# Enable foreign architectures support
RUN dpkg --print-architecture && \
dpkg --print-foreign-architectures
RUN dpkg --add-architecture i386 && \
dpkg --print-foreign-architectures
# Install required packages
COPY packages.txt /packages.txt
RUN apt-get -qq update && \
......@@ -12,6 +20,29 @@ RUN apt-get -qq update && \
RUN rm /packages.txt
# Install and setup python 3.10 as default
RUN add-apt-repository -y ppa:deadsnakes/ppa
RUN apt-get -qq update && \
apt-get install -qqy --no-install-recommends \
python3.8
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 2
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
RUN update-alternatives --set python3 /usr/bin/python3.8
# Install chromium build dependencies
RUN curl -s https://chromium.googlesource.com/chromium/src/+/master/build/install-build-deps.sh?format=TEXT | base64 -d \
| perl -pe 's/apt-get install \$\{do_quietly-}/DEBIAN_FRONTEND=noninteractive apt-get install -y/' \
| bash -e -s - \
--no-prompt \
--no-chromeos-fonts
# Setup locale
RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
ENV LANG en_US.UTF-8
# Get latest depot tools
RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git ${DEPOT_TOOLS}
RUN mkdir ${CHROMIUM_DIR}
......
# Frequently Asked Questions
## Does Google Sync/Translate/Data saver work?
No.
This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.
Additionally, these features would not be privacy-friendly.
## Does Bromite require root?
No.
## Is Bromite de-googled?
Yes, although this has not been verified (and hardly can be) under all situations; if you were to find connections to cloud-based services please report them via the issue tracker.
Bromite uses [ungoogled-chromium's python script](https://github.com/Eloston/ungoogled-chromium/blob/master/utils/domain_substitution.py) to disable URLs in the codebase since version `78.0.3904.93`.
Projects which follow a strict approach on this are [Iridium](https://iridiumbrowser.de/) and [Inox patchset](https://github.com/gcarq/inox-patchset).
## Does Bromite support DRM media?
Yes, in order to play protected/encrypted media content the browser will use Android's DRM media framework to automatically negotiate access (same as Chromium).
This means for example that requests to Android license servers will be performed (`www.googleapis.com`), see https://w3c.github.io/encrypted-media/#direct-individualization
To disable this functionality you should disable protected content playback from Site settings -> Multimedia.
## What is the SystemWebView?
It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.
See also [the wiki page](https://github.com/bromite/bromite/wiki/Installing-SystemWebView) for community-contributed installation instructions.
Ad-blocking was present and always enabled in the SystemWebView from version `72.0.3626.120` till version `77.0.3865.104`, when it stopped working due to [upstream NetworkService changes](https://docs.google.com/document/d/1TZEuPvr2KAbP4_TZpuuwtEEArQsyAkc2HDu68l66YwU/edit?ts=598244df#heading=h.ougoi5i6508y).
## How to enable DNS-over-HTTPS?
See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
## Can you add HTTPS everywhere?
No.
We cannot add add-ons to Bromite (merely some features).
## Is Bromite on Play Store?
No, and this is unlikely to change. Many limitations apply for submissions there, including which ads are allowed to be blocked.
Bromite favors user freedom in software choice: the device is yours so you get to choose which software to run on it, end of the story.
## Is Bromite on F-Droid?
It is not on the official F-Droid repository and there are no (more) plans to submit it.
You can use F-Droid client to install and receive updates via [the official Bromite F-Droid repository](https://www.bromite.org/fdroid).
## Does Bromite support WebRTC?
Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.
The WebRTC functionality has always been using safe defaults to prevent leaks (disabled multiple routes and non-proxied UDP).
## Using Bromite will favour the monopoly of the Chromium/Blink engine, why do you develop and maintain Bromite?
In short, to show what a Chromium-based engine could do **for the user** if the user experience and needs were the main focus of modern browser design.
For an Android browser using an alternative engine see [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/).
## Does Bromite support extensions?
No; Bromite will support extensions only if upstream (Chromium) does, or similarly another project maintains the patch and functionality.
## Why do push notifications not work on this website?
The [Chromium Blink engine](https://www.chromium.org/blink) uses [GCM](https://en.wikipedia.org/wiki/Google_Cloud_Messaging) to deliver messages
when websites use the [Push API](https://w3c.github.io/push-api/); this will not work in Bromite because cloud integrations are disabled (GCM in this case).
[ServiceWorker notifications](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration/showNotification) do work instead since they use
[android.app.Notification](https://developer.android.com/guide/topics/ui/notifiers/notifications).
## Can PWAs be installed?
PWAs are only supported as home shortcuts; WebAPKs will not work because they are generated server-side on googleapis.com (which is not allowed in Bromite).
## Does Bromite support the Android autofill framework?
No; the only autofill available in Chromium browsers requires integration with the Play Store binary blobs.
Some apps use accessibility services as a workaround.
## Does Bromite support casting media content?
No; this would require Play Store binary blobs.
bromite @ 5b6a7442
Subproject commit 5b6a7442e0c41d682efd0670755240f08563225a
......@@ -8,7 +8,7 @@ ARCH=arm
function usage() {
cat << EOT
usage $0 [-hac]
OPTIONS
-h show this usage
-a target build archictecture (default: arm)
......@@ -29,10 +29,10 @@ function init() {
function checkout() {
if [ -z "${CHROMIUM_VERSION}" ] ; then
CHROMIUM_VERSION=$(head -n 1 "${ROOT_DIR}/CHANGELOG.md" | sed 's/# \(.*\)/\1/')
CHROMIUM_VERSION=$(head -n 1 "${ROOT_DIR}/bromite/CHANGELOG.md" | sed 's/# \(.*\)/\1/')
export CHROMIUM_VERSION
fi
echo ">> [$(date)] Use Chromium v${CHROMIUM_VERSION}"
git fetch --tags
......@@ -54,11 +54,11 @@ function setup() {
function patch() {
echo ">> [$(date)] Apply Bromite and /e/ patches"
mv "${ROOT_DIR}"/build/patches/e/* "${ROOT_DIR}"/build/patches/
PATCHES_LIST=$(cat "${ROOT_DIR}/build/bromite_patches_list.txt" "${ROOT_DIR}/build/e_patches_list.txt")
mv "${ROOT_DIR}"/build/patches/* "${ROOT_DIR}"/bromite/build/patches/
PATCHES_LIST=$(cat "${ROOT_DIR}/bromite/build/bromite_patches_list.txt" "${ROOT_DIR}/build/e_patches_list.txt")
for file in $PATCHES_LIST; do
echo " -> Apply $file"
git apply "${ROOT_DIR}/build/patches/$file"
git apply "${ROOT_DIR}/bromite/build/patches/$file"
echo " "
done
gclient runhooks
......@@ -67,7 +67,7 @@ function patch() {
function build() {
local out="out/${BUILDID}_${ARCH}"
echo ">> [$(date)] Build for ${ARCH}"
gn gen --args="$(cat "${ROOT_DIR}"/build/GN_ARGS) target_cpu=\"${ARCH}\" " "$out"
gn gen --args="$(cat "${ROOT_DIR}"/bromite/build/GN_ARGS) target_cpu=\"${ARCH}\" " "$out"
autoninja -C "$out" chrome_public_apk system_webview_apk
cp "$out/apks/ChromePublic.apk" "${ROOT_DIR}/apks/ChromePublic_$ARCH.apk"
cp "$out/apks/SystemWebView.apk" "${ROOT_DIR}/apks/SystemWebView_$ARCH.apk"
......
android_channel="stable"
blink_symbol_level=1
chrome_pgo_phase=0
dcheck_always_on=false
debuggable_apks=false
dfmify_dev_ui=false
disable_android_lint=true
disable_autofill_assistant_dfm=true
disable_tab_ui_dfm=true
enable_av1_decoder=true
enable_dav1d_decoder=true
enable_gvr_services=false
enable_hangout_services_extension=false
enable_iterator_debugging=false
enable_mdns=false
enable_mse_mpeg2ts_stream_parser=true
enable_nacl=false
enable_nacl_nonsfi=false
enable_platform_dolby_vision=true
enable_platform_hevc=true
enable_remoting=false
enable_reporting=true
enable_vr=false
exclude_unwind_tables=false
ffmpeg_branding="Chrome"
fieldtrial_testing_like_official_build=true
icu_use_data_file=true
is_component_build=false
is_debug=false
is_official_build=true
proprietary_codecs=true
rtc_build_examples=false
safe_browsing_mode=0
symbol_level=1
target_os="android"
use_debug_fission=true
use_errorprone_java_compiler=false
use_gnome_keyring=false
use_official_google_api_keys=false
use_rtti=false
use_sysroot=false
webview_includes_weblayer=false
Disable-third-party-cookies-by-default.patch
Restore-classic-new-tab-page.patch
Always-use-new-tab-page-for-default-home-page.patch
Always-allow-partner-customisation.patch
battery_status_service-disable-more-privacy-nightmares.patch
Battery-API-return-nothing.patch
updater-disable-updater-pings.patch
Remove-EV-certificates.patch
promo-disable-Google-promotion-fetching.patch
Disable-omission-of-URL-elements-in-Omnibox.patch
Modify-default-preferences.patch
Do-not-hide-component-extensions.patch
Do-not-store-passwords-by-default.patch
Disable-NTP-remote-suggestions-by-default.patch
Disable-references-to-fonts.googleapis.com.patch
Change-default-webRTC-policy-to-not-use-any-address.patch
Never-send-any-crash-upload-data.patch
Hide-send-reports-checkbox.patch
Never-fetch-popular-sites.patch
ungoogled-chromium-Disable-webRTC-log-uploader.patch
ungoogled-chromium-Disable-untraceable-URLs.patch
ungoogled-chromium-Disable-translate-integration.patch
ungoogled-chromium-Disable-profile-avatar.patch
ungoogled-chromium-Disable-intranet-redirect-detector.patch
ungoogled-chromium-Disable-Google-host-detection.patch
ungoogled-chromium-Disable-Gaia.patch
ungoogled-chromium-Disable-domain-reliability.patch
ungoogled-chromium-Disable-Network-Time-Tracker.patch
Disable-safe-browsing.patch
Skip-the-first-run-and-metrics.patch
Disable-all-promo-dialogs.patch
Remove-signin-and-data-saver-integrations.patch
Hide-passwords-manager-link.patch
Disable-Omaha-update-checks.patch
Disable-update-scheduler.patch
openH264-enable-ARM-ARM64-optimizations.patch
Switch-to-fstack-protector-strong.patch
Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
build-remove-calling-untrusted-hooks.patch
AV1-codec-support.patch
Inject-scripts-for-AMP-tracking-ads-and-video.patch
Allow-playing-audio-in-background.patch
Add-flag-to-control-video-playback-resume-feature.patch
Open-YouTube-links-in-Bromite.patch
Add-exit-menu-item.patch
AudioBuffer-AnalyserNode-fp-mitigations.patch
Multiple-fingerprinting-mitigations.patch
Disable-metrics-on-all-I-O-threads.patch
Always-respect-async-dns-flag-regardless-of-SDK-version.patch
Add-flag-to-configure-maximum-connections-per-host.patch
Do-not-ignore-download-location-prompt-setting.patch
Add-bookmark-import-export-actions.patch
Add-an-always-incognito-mode.patch
Add-custom-tab-intents-privacy-option.patch
Add-option-to-not-persist-tabs-across-sessions.patch
Disable-fetching-of-all-field-trials.patch
Disable-seed-based-field-trials.patch
Disable-plugins-enumeration.patch
net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
profile-resetter-do-not-tick-send-settings-by-default.patch
browser-ui-disable-warning-about-missing-API-keys.patch
autofill-disable-autofill-download-manager.patch
first_run-deactivate-autoupdate-globally.patch
translate-disable-fetching-of-translate-languages-from-server.patch
kill-TOS-and-metrics-opt-out.patch
kill-Vision.patch
kill-Location-fall-back-to-system.patch
kill-Auth.patch
Remove-binary-blob-integrations.patch
Remove-SMS-integration.patch
Do-not-compile-QR-code-sharing.patch
Allow-website-sign-in-without-account-sign-in.patch
Offer-builtin-autocomplete-for-chrome-flags.patch
Do-not-grant-notifications-to-default-search-engine.patch
Add-flag-to-disable-IPv6-probes.patch
Add-a-proxy-configuration-page.patch
Use-4-tile-rows-never-show-logo.patch
Disable-metrics-collection-for-NTP-tiles.patch
Enable-SPPI-for-devices-with-enough-memory.patch
Use-64-bit-WebView-processes.patch
prefs-disable-signinallowed-by-default.patch
prefs-always-prompt-for-download-directory-by-default.patch
Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
disable-payment-support-by-default.patch
disable-background-sync-by-default.patch
disable-sensors-access-site-setting-by-default.patch
Disable-media-router-and-remoting-by-default.patch
Restore-Search-Ready-Omnibox-flag.patch
disable-AdsBlockedInfoBar.patch
Bromite-AdBlockUpdaterService.patch
Replace-DoH-probe-domain-with-RIPE-domain.patch
Increase-number-of-autocomplete-matches-from-5-to-10.patch
Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
Disable-some-signed-exchange-features.patch
Add-flag-to-disable-WebGL.patch
DoH-secure-mode-by-default.patch
Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
Revert-flags-remove-disable-pull-to-refresh-effect.patch
Use-dummy-DFM-installer.patch
Disable-feeds-support-by-default.patch
Disable-autofill-assistant-by-default.patch
Show-site-settings-for-cookies-javascript-and-ads.patch
Disable-DRM-media-origin-IDs-preprovisioning.patch
Disable-smart-selection-by-default.patch
Enable-user-agent-freeze-by-default.patch
disable-browser-autologin-by-default.patch
AImageReader-CFI-crash-mitigations.patch
Update-i18n-zh_CN-support.patch
Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
Add-menu-item-to-view-source.patch
Enable-prefetch-privacy-changes-by-default.patch
Disable-support-for-RAR-files-inspection.patch
Add-history-support-in-incognito-mode.patch
Enable-darken-websites-checkbox-in-themes.patch
Remove-blocklisted-URLs-upon-bookmark-creation.patch
Disable-the-DIAL-repeating-discovery.patch
Block-qjz9zk-or-trk-requests.patch
Hardening-against-incognito-mode-detection.patch
Remove-weblayer-dependency-on-Play-Services.patch
Timezone-customization.patch
Move-some-account-settings-back-to-privacy-settings.patch
Restore-Simplified-NTP-launch.patch
Revert-the-removal-of-an-option-to-block-autoplay.patch
Disable-text-fragments-by-default.patch
disable-WebView-variations-support.patch
disable-autofill-server-communication-by-default.patch
ask-permission-to-play-protected-media-by-default.patch
Enable-network-isolation-features.patch
Revert-flags-remove-num-raster-threads.patch
webview-Hard-no-to-persistent-histograms.patch
Ignore-enterprise-policies-for-secure-DNS.patch
Add-menu-item-to-bookmark-all-tabs.patch
Add-flag-for-save-data-header.patch
Add-option-to-force-tablet-UI.patch
Make-all-favicon-requests-on-demand.patch
Add-Alt-D-hotkey-to-focus-address-bar.patch
Remove-offline-measurement-background-task.patch
User-agent-customization.patch
Add-AllowUserCertificates-flag.patch
Add-IsCleartextPermitted-flag.patch
Disable-RTCGetCurrentBrowsingContextMedia-by-default.patch
Disable-FLoC-by-default.patch
Unexpire-tab-groups-flags.patch
Add-flag-for-omnibox-autocomplete-filtering.patch
Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch
Add-flag-to-disable-external-intent-requests.patch
Logcat-crash-reports-UI.patch
Add-support-for-ISupportHelpAndFeedback.patch
JIT-less-toggle.patch
API-level-21-prevent-crash-on-download.patch
Add-vibration-flag.patch
Automated-domain-substitution.patch
AV1-codec-support.patch
Switch-to-fstack-protector-strong.patch
Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
Disable-feeds-support-by-default.patch
e-set-package-name.patch
e-set-app-name.patch
e-set-popular-sites.patch
e-enable-donottrack.patch
e-share-search-engine.patch
e-async-dns-disable.patch
e-set-search-engines.patch
e-set-informations.patch
e-disable-autofill.patch
e-rebrand-translations.patch
e-enable-custom-tabs-by-default.patch
e-Launcher-icon-updated.patch
e-enable-search-suggestion.patch
e-replaced-chrome-with-browser-in-strings-file.patch
e-remove-string-google-from-other-services.patch
e-help-and-feedback-url.patch
e-disable-touch-to-search.patch
e-replace-chrome-icon-with-browser.patch
0001-Browser-Change-app-and-package-name-to-browser.patch
0001-Browser-Use-our-custom-icon-instead-of-chromium.patch
0001-Browser-Rename-strings-to-browser.patch
0001-Browser-Point-to-our-default-popular-sites.patch
0001-Browser-Enable-do-not-track-by-default.patch
0001-Browser-Add-provider-to-share-default-search-engine.patch
0001-Browser-Disable-async-DNS-by-default-on-Android.patch
0001-Browser-Enable-custom-tabs-by-default.patch
0001-Browser-Enable-search-suggestion-by-default.patch
0001-Browser-Hide-and-disable-touch-to-search-option.patch
0001-Browser-Modify-default-search-engines.patch
0001-Browser-Redirect-users-to-e-foundation-docs.patch
0001-Revert-Bromite-auto-updater.patch
0001-Revert-Block-gateway-attacks-via-websockets.patch
0001-Revert-Disable-unified-autoplay-feature.patch
From baa3101381755a9a7a196c0483e4a7e42104d90d Mon Sep 17 00:00:00 2001
From 013fbab37c4c5288cf0163bb3f88de0a58e06211 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:18:32 +0100
Subject: [PATCH] [PATCH] chrome: Share search engine
Date: Fri, 26 Nov 2021 08:03:13 +0000
Subject: [PATCH] Browser: Add provider to share default search engine
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
chrome/android/java/AndroidManifest.xml | 6 ++
.../provider/SearchEngineProvider.java | 79 +++++++++++++++++++
chrome/android/java_sources.gni | 2 +
3 files changed, 87 insertions(+)
chrome/android/java_sources.gni | 1 +
3 files changed, 86 insertions(+)
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index e4845fe382a0..3e6931aef72c 100644
index e2cf845e088ff..fdea2d7c83b21 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1151,6 +1151,12 @@ by a child template that "extends" this file.
@@ -1276,6 +1276,12 @@ by a child template that "extends" this file.
android:readPermission="android.permission.GLOBAL_SEARCH" />
</provider>
......@@ -30,7 +30,7 @@ index e4845fe382a0..3e6931aef72c 100644
{% block extra_application_definitions_for_test %}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
new file mode 100644
index 000000000000..86b7d3fd1457
index 0000000000000..299562413fe05
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
@@ -0,0 +1,79 @@
......@@ -114,15 +114,14 @@ index 000000000000..86b7d3fd1457
+ }
+}
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 01620861902e..74905035fffe 100644
index c4e4b7360ecd2..697a0e4ef4ad3 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -51,3 +51,5 @@ if (enable_arcore) {
"java/src/org/chromium/chrome/browser/vr/ArDelegateImpl.java",
]
@@ -62,3 +62,4 @@ if (enable_arcore) {
}
+
chrome_java_sources += userscripts_java_sources
+chrome_java_sources += [ "java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java" ]
--
2.17.1
2.25.1
From 951f672e7e7ff6d43a7c4a2e37fa5224c20c1312 Mon Sep 17 00:00:00 2001
From 9191f8e182bf92e882e9995e712960893f7a5b99 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 12:34:29 +0100
Subject: [PATCH] BUILD: Set package name of the browser to
"foundation.e.browser"
Date: Fri, 26 Nov 2021 05:39:25 +0000
Subject: [PATCH] Browser: Change app and package name to browser
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
chrome/android/BUILD.gn | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
chrome/android/BUILD.gn | 13 ++-----------
.../res_chromium_base/values/channel_constants.xml | 10 +++++-----
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index a489d1a3b1e4..f4d241a379d3 100644
index d440e71a0d886..0cb4718753fe7 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -34,16 +34,7 @@ import("java_sources.gni")
import("static_initializers.gni")
import("trichrome.gni")
@@ -44,16 +44,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") {
......@@ -24,14 +24,14 @@ index a489d1a3b1e4..f4d241a379d3 100644
- # AndroidManifest and its upstream target's .AndroidManifest.expected file
- # are as expected. Upstream targets having a "org.chromium.chrome" package
- # name will cause the comparison to output many unnecessary differences.
- # See https://source.chromium.org/chromium/chromium/src/+/master:chrome/android/java/README.md
- # See https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/README.md
- _default_package += "." + android_channel
-}
+_default_package = "foundation.e.browser"
declare_args() {
# Android package name to use when compiling the public chrome targets
@@ -55,7 +46,7 @@ declare_args() {
@@ -65,7 +56,7 @@ declare_args() {
# for details.
chrome_public_manifest_package = _default_package
}
......@@ -40,6 +40,25 @@ index a489d1a3b1e4..f4d241a379d3 100644
chrome_public_jinja_variables =
default_chrome_public_jinja_variables +
diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml b/chrome/android/java/res_chromium_base/values/channel_constants.xml
index 460cbd791f23b..5adce5db9d242 100644
--- a/chrome/android/java/res_chromium_base/values/channel_constants.xml
+++ b/chrome/android/java/res_chromium_base/values/channel_constants.xml
@@ -5,9 +5,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The application name displayed to the user. -->
- <string name="app_name" translatable="false">Chromium</string>
- <string name="bookmark_widget_title" translatable="false">Chromium bookmarks</string>
- <string name="search_widget_title" translatable="false">Chromium search</string>
- <string name="quick_action_search_widget_title" translatable="false">Chromium quick action search</string>
- <string name="dino_widget_title" translatable="false">Chromium dino</string>
+ <string name="app_name" translatable="false">Browser</string>
+ <string name="bookmark_widget_title" translatable="false">Browser bookmarks</string>
+ <string name="search_widget_title" translatable="false">Browser search</string>
+ <string name="quick_action_search_widget_title" translatable="false">Browser quick action search</string>
+ <string name="dino_widget_title" translatable="false">Browser dino</string>
</resources>
--
2.17.1
2.25.1
From f5f030cd86abc25ad8f53a7ce4ef308deda5ba78 Mon Sep 17 00:00:00 2001
From 26005fd02b8c03fc6ddd6c450ab766a522e6b53b Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:20:54 +0100
Subject: [PATCH] [PATCH] chrome_features: Use default DNS settings
Date: Fri, 26 Nov 2021 08:26:03 +0000
Subject: [PATCH] Browser: Disable async DNS by default on Android
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -9,18 +9,18 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 9f76e03a491b..d8dc824ff652 100644
index aac450f4fee76..49f2559598d00 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -85,7 +85,7 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
@@ -80,7 +80,7 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
// Enables the built-in DNS resolver.
const base::Feature kAsyncDns {
"AsyncDns",
-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC)
-#if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_ANDROID)
+#if defined(OS_CHROMEOS) || defined(OS_MAC)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
--
2.17.1
2.25.1
From 37fdad5af9959318e10cef89aeda832a02e309e5 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 1 Jun 2021 05:56:26 +0200
Subject: [PATCH] privacy_preferences: Enable custom tabs by default
From 2e1722f561cd6c96af515feb8ff9486990981496 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:37:37 +0000
Subject: [PATCH] Browser: Enable custom tabs by default
Signed-off-by: Aayush Gupta <theimpulson@e.email>
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
chrome/android/java/res/xml/privacy_preferences.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)