fix build for 108.0.5359.72

This commit is contained in:
Carmelo Messina
2022-12-03 10:56:42 +01:00
parent c1df1e7e9c
commit bdfa045f36
3 changed files with 50 additions and 3 deletions
+2 -1
View File
@@ -246,4 +246,5 @@ Fix-WebWorker-requestAnimationFrame.patch
00Add-menu-item-to-view-source--add-fixup-.patch
00Add-AudioContextAPI-flags.patch
00Disable-Component-Updates.patch
00wip-add-browser-policy.patch
00wip-add-browser-policy.patch
00temporary-fix-libaom-build-error.patch
@@ -43,7 +43,7 @@ Subject: Disable safe browsing (win fixup)
.../ui/views/download/download_item_view.cc | 23 +--
.../webui/downloads/downloads_dom_handler.cc | 12 +-
.../ui/webui/downloads/downloads_ui.cc | 5 +-
chrome/browser/ui/webui/intro/intro_ui.cc | 2 +
chrome/browser/ui/webui/intro/intro_ui.cc | 6 +-
chrome/browser/webshare/share_service_impl.cc | 4 +
chrome/chrome_paks.gni | 2 -
.../public/cpp/sandboxed_rar_analyzer.cc | 16 +-
@@ -53,7 +53,7 @@ Subject: Disable safe browsing (win fixup)
.../browser/mojo_safe_browsing_impl.cc | 1 +
.../core/common/safe_browsing_prefs.cc | 2 +-
.../tracked_persistent_pref_store_factory.cc | 10 +-
50 files changed, 65 insertions(+), 599 deletions(-)
50 files changed, 67 insertions(+), 601 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
@@ -1458,6 +1458,22 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/
diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui/intro/intro_ui.cc
--- a/chrome/browser/ui/webui/intro/intro_ui.cc
+++ b/chrome/browser/ui/webui/intro/intro_ui.cc
@@ -9,13 +9,13 @@
#include "chrome/browser/ui/webui/intro/intro_handler.h"
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/webui_url_constants.h"
-#include "chrome/grit/intro_resources.h"
-#include "chrome/grit/intro_resources_map.h"
#include "components/signin/public/base/signin_buildflags.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui_data_source.h"
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+#include "chrome/grit/intro_resources.h"
+#include "chrome/grit/intro_resources_map.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#endif
@@ -51,9 +51,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
web_ui->GetWebContents()->GetBrowserContext(),
chrome::kChromeUIIntroHost);
@@ -0,0 +1,30 @@
From: Your Name <you@example.com>
Date: Sat, 3 Dec 2022 08:59:11 +0000
Subject: temporary fix libaom build error
---
third_party/libaom/BUILD.gn | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
--- a/third_party/libaom/BUILD.gn
+++ b/third_party/libaom/BUILD.gn
@@ -260,11 +260,11 @@ static_library("libaom") {
# will detect CPU
sources += aom_ports_arm_sources
}
- if (current_cpu == "arm64" || current_cpu == "arm") {
- # This is needed by all arm boards due to aom_arm_cpu_caps()
- sources +=
- [ "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c" ]
- }
+ # if (current_cpu == "arm64" || current_cpu == "arm") {
+ # # This is needed by all arm boards due to aom_arm_cpu_caps()
+ # sources +=
+ # [ "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c" ]
+ # }
if (is_android) {
deps += [ "//third_party/android_ndk:cpu_features" ]
}
--
2.25.1