Browse Source

Update to 90.0.4430.93

master
wchen342 2 years ago
parent
commit
10d23dc758
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
  1. 5
      .build_config
  2. 19
      build.sh
  3. 2
      patches/Bromite/Add-flag-to-disable-WebGL.patch
  4. 2
      patches/Bromite/Add-flags-to-disable-device-motion-orientation-APIs.patch
  5. 8
      patches/Bromite/Revert-flags-remove-disable-pull-to-refresh-effect.patch
  6. 4
      patches/Other/ungoogled-main-repo-fix.patch
  7. 1
      patches/series
  8. 2
      patches/ungoogled-chromium-android/Add-save-data-flag.patch
  9. 2
      patches/ungoogled-chromium-android/Enable-update-notification.patch
  10. 68
      patches/ungoogled-chromium-android/tricrhome-webview-64.patch

5
.build_config

@ -6,9 +6,10 @@ trichrome_chrome_64_bundle_target=trichrome_chrome_64_bundle
trichrome_chrome_apk_target=trichrome_library_apk
webview_target=system_webview_apk
trichrome_webview_target=trichrome_webview_apk
trichrome_webview_64_target=trichrome_webview_64_apk
all=all
chromium_version=90.0.4430.72
ungoogled_chromium_version=90.0.4430.72
chromium_version=90.0.4430.93
ungoogled_chromium_version=90.0.4430.93
ungoogled_chromium_revision=1
ungoogled_chromium_android_revision=1

19
build.sh

@ -82,8 +82,12 @@ if [[ "$TARGET" != "chrome_modern_target" ]] && [[ "$TARGET" != "trichrome_chrom
fi
# 64-bit TriChrome
if [[ "$ARCH" == "arm64" ]] && [[ "$TARGET" == "trichrome_chrome_bundle_target" ]]; then
TARGET_EXPANDED=${trichrome_chrome_64_bundle_target}
if [[ "$ARCH" == "arm64" ]]; then
if [[ "$TARGET" == "trichrome_chrome_bundle_target" ]]; then
TARGET_EXPANDED=${trichrome_chrome_64_bundle_target}
elif [[ "$TARGET" == "trichrome_webview_target" ]]; then
TARGET_EXPANDED=trichrome_webview_64_target
fi
else
TARGET_EXPANDED=${!TARGET}
fi
@ -237,17 +241,6 @@ python3 ungoogled-chromium/utils/patches.py apply src ungoogled-chromium/patches
python3 ungoogled-chromium/utils/domain_substitution.py apply -r ungoogled-chromium/domain_regex.list -f ungoogled-chromium/domain_substitution.list -c ${cache_file} src
# Workaround for a building failure caused by safe browsing. The file is pre-generated with safe_browsing_mode=2. See https://github.com/nikolowry/bromite-builder/issues/1
cp safe_browsing_proto_files/download_file_types.pb.h src/chrome/common/safe_browsing/download_file_types.pb.h
cp safe_browsing_proto_files/webprotect.pb.h src/components/safe_browsing/core/proto/webprotect.pb.h
# Copy overlay jars built from
# //third_party/android_deps/local_modifications/androidx_fragment_fragment:androidx_fragment_fragment_partial_java
# and
# //third_party/android_deps/local_modifications/androidx_preference_preference:androidx_preference_preference_partial_java
cp prebuilt_jar/androidx_fragment_fragment/androidx_fragment_fragment_java.jar src/third_party/android_deps/local_modifications/androidx_fragment_fragment
cp prebuilt_jar/androidx_preference_preference/androidx_preference_preference_java.jar src/third_party/android_deps/local_modifications/androidx_preference_preference
## Prepare Android SDK/NDK
SDK_DIR="android-sdk_eng.11.0.0_r27_linux-x86"

2
patches/Bromite/Add-flag-to-disable-WebGL.patch

@ -10,7 +10,7 @@ Subject: Add flag to disable WebGL
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2620,6 +2620,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2625,6 +2625,9 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kAccelerated2dCanvasName,
flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},

2
patches/Bromite/Add-flags-to-disable-device-motion-orientation-APIs.patch

@ -19,7 +19,7 @@ legacy acceleration events.
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2846,6 +2846,12 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2851,6 +2851,12 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
flag_descriptions::kGpuRasterizationDescription, kOsAll,
MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},

8
patches/Bromite/Revert-flags-remove-disable-pull-to-refresh-effect.patch

@ -12,7 +12,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3262,6 +3262,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3267,6 +3267,10 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)},
#endif // OS_MAC
#if defined(OS_ANDROID)
@ -25,7 +25,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
flag_descriptions::kTranslateForceTriggerOnEnglishDescription, kOsAndroid,
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1092,6 +1092,11 @@
@@ -1097,6 +1097,11 @@
"expiry_milestone": -1
},
{
@ -39,7 +39,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
"expiry_milestone": 83
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3236,6 +3236,10 @@ const char kReadLaterDescription[] =
@@ -3240,6 +3240,10 @@ const char kReadLaterDescription[] =
"Allow users to save tabs for later. Enables a new button and menu for "
"accessing tabs saved for later.";
@ -52,7 +52,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
"Determines what pages the Reader Mode infobar is shown on.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1873,6 +1873,9 @@ extern const char kQueryTilesMoreTrendin
@@ -1876,6 +1876,9 @@ extern const char kQueryTilesMoreTrendin
extern const char kQueryTilesSwapTrendingName[];
extern const char kQueryTilesSwapTrendingDescription[];

4
patches/Other/ungoogled-main-repo-fix.patch

@ -15,8 +15,8 @@ author: Wengling Chen <[email protected]>
fieldtrial_testing_like_official_build=true
google_api_key=""
google_default_client_id=""
--- a/pruning.list
+++ b/pruning.list
--- a/ungoogled-chromium/pruning.list
+++ b/ungoogled-chromium/pruning.list
@@ -17462,7 +17462,6 @@ third_party/pyelftools/test/testfiles_for_unittests/simple_gcc.elf.arm
third_party/pywebsocket3/src/test/cert/client_cert.p12
third_party/quic_trace/src/examples/example.json.gz

1
patches/series

@ -44,6 +44,7 @@ ungoogled-chromium-android/Add-save-data-flag.patch
ungoogled-chromium-android/Add-always-desktop-option.patch
ungoogled-chromium-android/Add-force-tablet-ui-option.patch
ungoogled-chromium-android/Disable-tflite.patch
ungoogled-chromium-android/tricrhome-webview-64.patch
Bromite/Remove-account-permissions-from-manifest.patch
Bromite/updater-disable-updater-pings.patch
Bromite/Change-default-webRTC-policy-to-not-use-any-address.patch

2
patches/ungoogled-chromium-android/Add-save-data-flag.patch

@ -12,7 +12,7 @@ author: Wengling Chen <[email protected]>
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4617,6 +4617,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4622,6 +4622,9 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_WITH_PARAMS_VALUE_TYPE(features::kMBIMode,
kMBIModeVariations,
"MBIMode")},

2
patches/ungoogled-chromium-android/Enable-update-notification.patch

@ -411,7 +411,7 @@
Update Chrome
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1919,7 +1919,7 @@
@@ -1924,7 +1924,7 @@
{
"name": "enable-inline-update-flow",
"owners": [ "nyquist", "dtrainor" ],

68
patches/ungoogled-chromium-android/tricrhome-webview-64.patch

@ -0,0 +1,68 @@
description: Add trichrome_webview_64_tmpl
author: Wengling Chen <[email protected]>
---
android_webview/BUILD.gn | 22 ++++++++++++++++++++++
android_webview/nonembedded/BUILD.gn | 10 ++++++++++
android_webview/variables.gni | 2 ++
3 files changed, 34 insertions(+)
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -267,6 +267,28 @@ if (android_64bit_target_cpu) {
static_library_provider = "//chrome/android:trichrome_library_32_apk"
}
}
+
+ template("trichrome_webview_64_tmpl") {
+ system_webview_apk_or_module_tmpl(target_name) {
+ forward_variables_from(invoker, "*")
+ android_manifest = trichrome_webview_64_android_manifest
+ android_manifest_dep =
+ "//android_webview/nonembedded:trichrome_webview_64_manifest"
+ use_trichrome_library = true
+ is_64_bit_browser = true
+ include_32_bit_webview = false
+
+ min_sdk_version = 29
+
+ deps = upstream_only_webview_deps
+ static_library_provider = "//chrome/android:trichrome_library_64_apk"
+ }
+ }
+
+ trichrome_webview_64_tmpl("trichrome_webview_64_apk") {
+ apk_name = "TrichromeWebView64"
+ uncompress_dex = true
+ }
}
# The shared library used by standalone WebView.
--- a/android_webview/nonembedded/BUILD.gn
+++ b/android_webview/nonembedded/BUILD.gn
@@ -252,4 +252,14 @@ if (android_64bit_target_cpu) {
"library=libmonochrome.so",
]
}
+
+ jinja_template("trichrome_webview_64_manifest") {
+ input = "java/AndroidManifest.xml"
+ output = trichrome_webview_64_android_manifest
+ variables = trichrome_jinja_variables + _webview_jinja_variables + [
+ "trichrome_version=$trichrome_64_version_code",
+ "library=libmonochrome_64.so",
+ "use32bitAbi=",
+ ]
+ }
}
--- a/android_webview/variables.gni
+++ b/android_webview/variables.gni
@@ -19,6 +19,8 @@ system_webview_android_manifest =
trichrome_webview_android_manifest =
"$root_gen_dir/android_webview/trichrome_webview_apk/AndroidManifest.xml"
trichrome_webview_64_32_android_manifest = "$root_gen_dir/android_webview/trichrome_webview_64_32_apk/AndroidManifest.xml"
+trichrome_webview_64_android_manifest =
+ "$root_gen_dir/android_webview/trichrome_webview_64_apk/AndroidManifest.xml"
trichrome_webview_32_android_manifest =
"$root_gen_dir/android_webview/trichrome_webview_32_apk/AndroidManifest.xml"
Loading…
Cancel
Save