Skip to content

Commit fa6a4f6

Browse files
authored
chromium-stable: bump to 131.0.6778.264 (#38)
[skip ci]
1 parent cb0c368 commit fa6a4f6

17 files changed

+131
-110
lines changed

tur-chromium/chromium-stable/1001-chromium-disable-sandbox.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/content/shell/app/shell_main_delegate.cc
22
+++ b/content/shell/app/shell_main_delegate.cc
3-
@@ -90,6 +90,10 @@
3+
@@ -92,6 +92,10 @@
44
#include "content/shell/app/ios/shell_application_ios.h"
55
#endif
66

@@ -10,11 +10,11 @@
1010
+
1111
namespace {
1212

13-
#if !BUILDFLAG(IS_FUCHSIA)
14-
@@ -210,6 +214,15 @@
15-
base::CPU cpu_info;
16-
#endif
13+
enum class LoggingDest {
14+
@@ -256,6 +260,15 @@
15+
}
1716

17+
void ShellMainDelegate::PreSandboxStartup() {
1818
+// Disable sandbox on Termux.
1919
+#ifdef __TERMUX__
2020
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -26,7 +26,7 @@
2626
+
2727
// Disable platform crash handling and initialize the crash reporter, if
2828
// requested.
29-
// TODO(crbug.com/1226159): Implement crash reporter integration for Fuchsia.
29+
// TODO(crbug.com/40188745): Implement crash reporter integration for Fuchsia.
3030
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
3131
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
3232
@@ -60,10 +60,12 @@
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc
2+
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc
3+
@@ -36,6 +36,11 @@
4+
#include <sys/mman.h>
5+
#endif
6+
7+
+#if defined(__ANDROID__) && __ANDROID_API__ < 30
8+
+#include <sys/syscall.h>
9+
+#define memfd_create(name,flags) syscall(SYS_memfd_create,name,flags)
10+
+#endif
11+
+
12+
namespace partition_alloc::internal {
13+
14+
#if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
15+
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
16+
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
17+
@@ -51,6 +51,11 @@
18+
#endif // PA_CONFIG(ENABLE_SHADOW_METADATA)
19+
#endif // PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
20+
21+
+#if defined(__ANDROID__) && __ANDROID_API__ < 30
22+
+#include <sys/syscall.h>
23+
+#define memfd_create(name,flags) syscall(SYS_memfd_create,name,flags)
24+
+#endif
25+
+
26+
namespace partition_alloc::internal {
27+
28+
#if PA_BUILDFLAG(RECORD_ALLOC_INFO)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/chrome/browser/ui/startup/infobar_utils.cc
2+
+++ b/chrome/browser/ui/startup/infobar_utils.cc
3+
@@ -154,7 +154,11 @@
4+
infobars::ContentInfoBarManager* infobar_manager =
5+
infobars::ContentInfoBarManager::FromWebContents(web_contents);
6+
7+
+#ifdef __TERMUX__
8+
+ if (0) {
9+
+#else
10+
if (!google_apis::HasAPIKeyConfigured()) {
11+
+#endif
12+
GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
13+
}
14+
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
--- a/third_party/dav1d/libdav1d/src/cpu.c
22
+++ b/third_party/dav1d/libdav1d/src/cpu.c
3-
@@ -87,7 +87,7 @@
3+
@@ -91,7 +91,7 @@
44
GetNativeSystemInfo(&system_info);
55
return system_info.dwNumberOfProcessors;
66
#endif
7-
-#elif defined(HAVE_PTHREAD_GETAFFINITY_NP) && defined(CPU_COUNT)
8-
+#elif defined(HAVE_PTHREAD_GETAFFINITY_NP) && defined(CPU_COUNT) && !defined(__ANDROID__)
7+
-#elif HAVE_PTHREAD_GETAFFINITY_NP && defined(CPU_COUNT)
8+
+#elif HAVE_PTHREAD_GETAFFINITY_NP && defined(CPU_COUNT) && !defined(__ANDROID__)
99
cpu_set_t affinity;
1010
if (!pthread_getaffinity_np(pthread_self(), sizeof(affinity), &affinity))
1111
return CPU_COUNT(&affinity);

tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141

4242
-#if defined(__ANDROID__)
4343
+#if defined(__ANDROID__) && !defined(__TERMUX__)
44-
static std::string GetAndroidProperty(const char *name) {
45-
std::string output;
46-
const prop_info *pi = __system_property_find(name);
47-
@@ -51,7 +51,7 @@
44+
/*
45+
* Use the __system_property_read_callback API that appeared in
46+
* Android API level 26. If not avaible use the old __system_property_get function.
47+
@@ -68,7 +68,7 @@
4848
#endif
4949

5050
static std::string GetEnvironment(const char *variable) {
@@ -53,7 +53,7 @@
5353
std::string result = GetAndroidProperty(variable);
5454
// Workaround for screenshot layer backward compatibility
5555
if (result.empty() && std::string(variable) == "debug.vulkan.screenshot.frames") {
56-
@@ -199,7 +199,7 @@
56+
@@ -214,7 +214,7 @@
5757
}
5858
#endif
5959

tur-chromium/chromium-stable/2020-dav1d-config.patch

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Aarch64 Android compiles as `armv8-a` and don't have so much extensions.
1111

1212
#define CONFIG_16BPC 1
1313

14-
@@ -41,15 +41,15 @@
14+
@@ -45,15 +45,15 @@
1515

1616
#define HAVE_ASM 1
1717

@@ -32,29 +32,31 @@ Aarch64 Android compiles as `armv8-a` and don't have so much extensions.
3232

3333
#define HAVE_AS_FUNC 0
3434

35-
@@ -59,11 +59,11 @@
35+
@@ -63,13 +63,13 @@
3636

3737
#define HAVE_DLSYM 1
3838

3939
-#define HAVE_DOTPROD 1
4040
+// #define HAVE_DOTPROD 1
4141

42+
#define HAVE_ELF_AUX_INFO 0
43+
4244
#define HAVE_GETAUXVAL 1
4345

4446
-#define HAVE_I8MM 1
4547
+// #define HAVE_I8MM 1
4648

47-
#define HAVE_POSIX_MEMALIGN 1
49+
#define HAVE_IO_H 0
4850

49-
@@ -71,9 +71,9 @@
51+
@@ -87,9 +87,9 @@
5052

51-
// #define HAVE_PTHREAD_SETAFFINITY_NP 1 -- Controlled by Chomium
53+
#define HAVE_PTHREAD_SET_NAME_NP 0
5254

5355
-#define HAVE_SVE 1
5456
+// #define HAVE_SVE 1
5557

5658
-#define HAVE_SVE2 1
5759
+// #define HAVE_SVE2 1
5860

59-
#define HAVE_UNISTD_H 1
61+
#define HAVE_SYS_TYPES_H 1
6062

tur-chromium/chromium-stable/8001-blink-include-bitset-2.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)