Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37dc3f3f authored by csagan5's avatar csagan5 Committed by Carl
Browse files

Further build and linking fixes

parent 506078ce

build/bromite_patches_list.txt

+3 −4
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ Disable-offline-pages-in-CCT.patch 
Disable-media-router-and-remoting-by-default.patch

Restore-Search-Ready-Omnibox-flag.patch

disable-AdsBlockedInfoBar.patch

Bromite-AdBlockUpdaterService.patch

Bromite-subresource-adblocker.patch

Bromite-auto-updater.patch

Replace-DoH-probe-domain-with-RIPE-domain.patch

Increase-number-of-autocomplete-matches-to-10.patch

Disable-requests-for-single-word-Omnibar-searches.patch
@@ -139,8 +140,8 @@ Add-IsCleartextPermitted-flag.patch 
Unexpire-tab-groups-flags.patch

Add-flag-for-omnibox-autocomplete-filtering.patch

Revert-Delete-block-external-form-redirects.patch

Enable-IntentBlockExternalFormRedirectsNoGesture.patch

Add-flag-to-disable-external-intent-requests.patch

Enable-share-intent.patch

Logcat-crash-reports-UI.patch

Add-flag-to-disable-vibration.patch

mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
@@ -148,8 +149,6 @@ Client-hints-overrides.patch 
Disable-AGSA-by-default.patch

Allow-building-without-enable_reporting.patch

Disable-lock-icon-in-address-bar-by-default.patch

Enable-share-intent.patch

Bromite-auto-updater.patch

Experimental-user-scripts-support.patch

Keep-empty-tabs-between-sessions.patch

Disable-third-party-origin-trials.patch

build/patches/Add-AllowUserCertificates-flag.patch

+3 −3
Original line number Diff line number Diff line
@@ -101,13 +101,13 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Autoplay,

@@ -467,6 +468,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,

@@ -468,6 +469,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,

              "AllowNewIncognitoTabIntents",

              base::FEATURE_ENABLED_BY_DEFAULT);

 

+BASE_FEATURE(kAllowUserCertificates,

+             "AllowUserCertificates",

+             base::FEATURE_DISABLED_BY_DEFAULT};

+             base::FEATURE_DISABLED_BY_DEFAULT);

+

 BASE_FEATURE(kFocusOmniboxInIncognitoTabIntents,

              "FocusOmniboxInIncognitoTabIntents",
@@ -145,7 +145,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -647,6 +648,8 @@ public abstract class ChromeFeatureList {

@@ -648,6 +649,8 @@ public abstract class ChromeFeatureList {

     public static final String FEED_REPLACE_ALL = "FeedReplaceAll";

 

     /* Alphabetical: */

build/patches/Add-a-proxy-configuration-page.patch

+24 −24
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 chrome/browser/prefs/browser_prefs.cc         |   4 +

 .../prefs/chrome_command_line_pref_store.cc   |   2 +-

 chrome/browser/resources/proxy_config.css     |  61 +++

 chrome/browser/resources/proxy_config.html    |  79 ++++

 chrome/browser/resources/proxy_config.js      | 266 +++++++++++

 chrome/browser/resources/proxy_config.html    |  78 ++++

 chrome/browser/resources/proxy_config.js      | 267 +++++++++++

 chrome/browser/ui/BUILD.gn                    |   2 +

 .../webui/chrome_web_ui_controller_factory.cc |   3 +

 chrome/browser/ui/webui/proxy_config_ui.cc    | 418 ++++++++++++++++++
@@ -76,14 +76,14 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -70,6 +70,7 @@ public class PrivacySettings

             SharedPreferencesManager.getInstance();

     private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());

 

@@ -59,6 +59,7 @@ public class PrivacySettings

     private static final String PREF_DO_NOT_TRACK = "do_not_track";

     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";

     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";

+    private static final String PREF_PROXY_OPTIONS = "proxy";

     private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";

     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";

     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";

 

     private ManagedPreferenceDelegate mManagedPreferenceDelegate;

diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -287,7 +287,7 @@ diff --git a/chrome/browser/resources/proxy_config.html b/chrome/browser/resourc 
new file mode 100644

--- /dev/null

+++ b/chrome/browser/resources/proxy_config.html

@@ -0,0 +1,79 @@

@@ -0,0 +1,78 @@

+<!doctype html>

+<html>

+<head>
@@ -301,8 +301,7 @@ new file mode 100644 
+<script src="chrome://resources/js/ios/web_ui.js"></script>

+</if>

+

+<script src="chrome://resources/js/assert.js"></script>

+<script src="chrome://resources/js/util.js"></script>

+<script type="module" src="chrome://resources/js/assert.js"></script>

+<script type="module" src="chrome://proxy/proxy_config.js"></script>

+<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">

+<link rel="stylesheet" href="proxy_config.css">
@@ -371,7 +370,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources 
new file mode 100644

--- /dev/null

+++ b/chrome/browser/resources/proxy_config.js

@@ -0,0 +1,266 @@

@@ -0,0 +1,267 @@

+/*

+    This file is part of Bromite.

+
@@ -389,6 +388,7 @@ new file mode 100644 
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.

+*/

+

+import {$} from 'chrome://resources/js/util.js';

+import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';

+

+/**
@@ -936,7 +936,7 @@ new file mode 100644 
+

+  const PrefService::Preference* const pref =

+      pref_service_->FindPreference(proxy_config::prefs::kProxy);

+  ProxyConfigDictionary proxy_dict(pref->GetValue()->Clone());

+  ProxyConfigDictionary proxy_dict(pref->GetValue()->GetDict().Clone());

+  ProxyPrefs::ProxyMode mode;

+  if (!proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_SYSTEM) {

+    availability = net::ProxyConfigService::CONFIG_UNSET;
@@ -948,8 +948,8 @@ new file mode 100644 
+void ProxyConfigMessageHandler::OnClear(const base::Value::List& list) {

+  DCHECK_CURRENTLY_ON(BrowserThread::UI);

+

+  const base::Value cfg = ProxyConfigDictionary::CreateSystem();

+  pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+  const base::Value::Dict cfg = ProxyConfigDictionary::CreateSystem();

+  pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());

+  pref_service_->CommitPendingWrite();

+  OnEnableNotifyUIWithState(list);

+}
@@ -1060,22 +1060,22 @@ new file mode 100644 
+

+void ProxyConfigMessageHandler::apply(const net::ProxyConfig& proxyConfig) {

+  if (proxyConfig.auto_detect()) {

+    const base::Value cfg = ProxyConfigDictionary::CreateAutoDetect();

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateAutoDetect();

+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());

+  } else if (proxyConfig.has_pac_url()) {

+    const base::Value cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+    const base::Value::Dict cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());

+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());

+  } else if (proxyConfig.proxy_rules().type == net::ProxyConfig::ProxyRules::Type::EMPTY) {

+    const base::Value cfg = ProxyConfigDictionary::CreateDirect();

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateDirect();

+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());

+  } else {

+    auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();

+    auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();

+

+    // fixed servers

+    const base::Value cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,

+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,

+                            bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());

+  }

+  pref_service_->CommitPendingWrite();

+
@@ -1197,7 +1197,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro 
 }

 

+bool ProxyConfigDictionary::HasReverseBypass() const {

+  const base::Value* value = dict_.FindKey(kProxyReverseBypass);

+  const base::Value* value = dict_.Find(kProxyReverseBypass);

+  if (!value || !value->is_bool()) {

+    return false;

+  }

build/patches/Add-bookmark-import-export-actions.patch

+6 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../DownloadLocationDialogCoordinator.java    |   8 +-

 chrome/browser/flag_descriptions.cc           |   5 +

 chrome/browser/flag_descriptions.h            |   3 +

 .../flags/android/chrome_feature_list.cc      |   5 +

 .../flags/android/chrome_feature_list.cc      |   6 +

 .../flags/android/chrome_feature_list.h       |   1 +

 .../browser/flags/ChromeFeatureList.java      |   1 +

 chrome/browser/importer/profile_writer.cc     |  12 +
@@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 ui/shell_dialogs/select_file_dialog.h         |   2 +

 .../select_file_dialog_android.cc             |   6 +

 ui/shell_dialogs/select_file_dialog_android.h |   2 +

 35 files changed, 847 insertions(+), 29 deletions(-)

 35 files changed, 848 insertions(+), 29 deletions(-)



diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

--- a/chrome/android/java/AndroidManifest.xml
@@ -1287,13 +1287,14 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
     &kCriticalPersistedTabData,

     &kCommerceCoupons,

     &kCCTBackgroundTab,

@@ -1114,6 +1115,10 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,

@@ -1114,6 +1115,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,

              "WebApkTrampolineOnInitialIntent",

              base::FEATURE_ENABLED_BY_DEFAULT);

 

+// disabled by default because of an issue on Android 6.0

+const base::Feature kBookmarksExportUseSaf{"BookmarksExportUseSaf",

+                                        base::FEATURE_DISABLED_BY_DEFAULT};

+BASE_FEATURE(kBookmarksExportUseSaf,

+             "BookmarksExportUseSaf",

+             base::FEATURE_DISABLED_BY_DEFAULT);

+

 static jboolean JNI_ChromeFeatureList_IsEnabled(

     JNIEnv* env,

build/patches/Add-menu-item-to-bookmark-all-tabs.patch

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse 
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -3585,6 +3585,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p

@@ -3606,6 +3606,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p

       <message name="IDS_MENU_TRACK_PRICES" desc="Menu item for tracking prices on tabs. [CHAR_LIMIT=27]">

         Track prices

       </message>