Browse Source

Update to 75.0.3770.142

tags/75.0.3770.142-1
wchen342 2 years ago
parent
commit
cccee31884
Signed by: wchen342 GPG Key ID: 720B70365E800508
4 changed files with 91 additions and 4 deletions
  1. +6
    -2
      build.sh
  2. +24
    -0
      patches/Vanadium/0020-disable-media-router-media-remoting-by-default.patch
  3. +55
    -0
      patches/Vanadium/0021-disable-media-router-by-default.patch
  4. +6
    -2
      patches/aapt2-param.patch

+ 6
- 2
build.sh View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -eux -o pipefail
chromium_version=75.0.3770.100
chromium_version=75.0.3770.142
target=monochrome_public_apk
# Required tools: python2, python3, ninja, git, clang, lld, llvm, curl
@ -79,7 +79,7 @@ python src/build/util/lastchange.py -m SKIA_COMMIT_HASH -s src/third_party/skia
patch -p1 --ignore-whitespace -i patches/android-prune-domain-fix.patch --no-backup-if-mismatch
# Remove the cache file if exists
cache_file="domsubcache.tar.gz"
if [ -f ${cache_file} ] ; then
if [[ -f ${cache_file} ]] ; then
rm ${cache_file}
fi
@ -172,6 +172,10 @@ popd
# Some of the support libraries can be grabbed from maven https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/com/android/support/
# Additional Source Patches
# TODO use patches.py instead
patch -p1 --ignore-whitespace -i patches/Vanadium/0020-disable-media-router-media-remoting-by-default.patch --no-backup-if-mismatch
patch -p1 --ignore-whitespace -i patches/Vanadium/0021-disable-media-router-by-default.patch --no-backup-if-mismatch
## Second pruning list
pruning_list_2="pruning_2.list"
python3 ungoogled-chromium/utils/prune_binaries.py src ${pruning_list_2} || true


+ 24
- 0
patches/Vanadium/0020-disable-media-router-media-remoting-by-default.patch View File

@ -0,0 +1,24 @@
From 99cfe5951292db607db5399f7e7526266bb273ab Mon Sep 17 00:00:00 2001
From: Daniel Micay <[email protected]>
Date: Thu, 4 Jul 2019 18:11:27 -0400
Subject: [PATCH 20/30] disable media router media remoting by default
---
chrome/browser/profiles/profile.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/chrome/browser/profiles/profile.cc b/src/chrome/browser/profiles/profile.cc
index e56624c60f42..dc2479bc4ad0 100644
--- a/src/chrome/browser/profiles/profile.cc
+++ b/src/chrome/browser/profiles/profile.cc
@@ -218,7 +218,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
prefs::kMediaRouterFirstRunFlowAcknowledged,
false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, true);
+ registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, false);
registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources);
registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets);
--
2.22.0

+ 55
- 0
patches/Vanadium/0021-disable-media-router-by-default.patch View File

@ -0,0 +1,55 @@
From 75c087d108655330beabb7729432b083e625e925 Mon Sep 17 00:00:00 2001
From: Daniel Micay <[email protected]>
Date: Thu, 4 Jul 2019 19:08:52 -0400
Subject: [PATCH 21/30] disable media router by default
---
.../media/router/media_router_feature.cc | 17 ++++++++---------
chrome/browser/profiles/profile_impl.cc | 2 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/chrome/browser/media/router/media_router_feature.cc b/src/chrome/browser/media/router/media_router_feature.cc
index 9c42d30ecd22..e773dd54ad9e 100644
--- a/src/chrome/browser/media/router/media_router_feature.cc
+++ b/src/chrome/browser/media/router/media_router_feature.cc
@@ -56,17 +56,16 @@ const PrefService::Preference* GetMediaRouterPref(
bool MediaRouterEnabled(content::BrowserContext* context) {
#if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
- const PrefService::Preference* pref = GetMediaRouterPref(context);
- // Only use the pref value if it set from a mandatory policy.
- if (pref->IsManaged() && !pref->IsDefaultValue()) {
- bool allowed = false;
- CHECK(pref->GetValue()->GetAsBoolean(&allowed));
- return allowed;
- }
-
// The component extension cannot be loaded in guest sessions.
// TODO(crbug.com/756243): Figure out why.
- return !Profile::FromBrowserContext(context)->IsGuestSession();
+ if (Profile::FromBrowserContext(context)->IsGuestSession()) {
+ return false;
+ }
+
+ const PrefService::Preference* pref = GetMediaRouterPref(context);
+ bool allowed = false;
+ pref->GetValue()->GetAsBoolean(&allowed);
+ return allowed;
#else // !(defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS))
return false;
#endif // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/src/chrome/browser/profiles/profile_impl.cc b/src/chrome/browser/profiles/profile_impl.cc
index 86ffb0c6cfc3..e32f0e7b83fe 100644
--- a/src/chrome/browser/profiles/profile_impl.cc
+++ b/src/chrome/browser/profiles/profile_impl.cc
@@ -443,7 +443,7 @@ void ProfileImpl::RegisterProfilePrefs(
registry->RegisterStringPref(
prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
- registry->RegisterBooleanPref(prefs::kEnableMediaRouter, true);
+ registry->RegisterBooleanPref(prefs::kEnableMediaRouter, false);
#if defined(OS_CHROMEOS)
registry->RegisterBooleanPref(
prefs::kOobeMarketingOptInScreenFinished, false,
--
2.22.0

+ 6
- 2
patches/aapt2-param.patch View File

@ -3,8 +3,12 @@ author: Wengling Chen <[email protected]>
--- a/src/build/android/gyp/compile_resources.py
+++ b/src/build/android/gyp/compile_resources.py
@@ -834,8 +834,8 @@
'--enable-resource-obfuscation',
@@ -831,11 +831,11 @@
optimize_command = [
options.aapt2_path,
'optimize',
- '--enable-resource-obfuscation',
+ #'--enable-resource-obfuscation',
'-o',
output,
- '--resources-config-path',


Loading…
Cancel
Save