Skip to content

Commit

Permalink
chromium: update to 99.0.4844.51.
Browse files Browse the repository at this point in the history
  • Loading branch information
Duncaen committed Mar 3, 2022
1 parent 96e0c73 commit 2e084a1
Show file tree
Hide file tree
Showing 26 changed files with 410 additions and 491 deletions.

This file was deleted.

23 changes: 0 additions & 23 deletions srcpkgs/chromium/files/musl-patches/musl-crashpad.patch

This file was deleted.

212 changes: 0 additions & 212 deletions srcpkgs/chromium/files/musl-patches/musl-fixes.patch

This file was deleted.

30 changes: 0 additions & 30 deletions srcpkgs/chromium/files/musl-patches/musl-sync.patch

This file was deleted.

27 changes: 14 additions & 13 deletions srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,35 @@
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 33)
#define MALLINFO2_FOUND_IN_LIBC
--- ./base/process/process_metrics_posix.cc
+++ ./base/process/process_metrics_posix.cc
--- base/process/process_metrics_posix.cc.orig
+++ base/process/process_metrics_posix.cc
@@ -105,7 +105,7 @@

#endif // !defined(OS_FUCHSIA)
#endif // !BUILDFLAG(IS_FUCHSIA)

-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
namespace {

size_t GetMallocUsageMallinfo() {
@@ -127,16 +127,16 @@
@@ -123,7 +123,7 @@
}

} // namespace
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#endif // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+#endif // (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID)

size_t ProcessMetrics::GetMallocUsage() {
#if defined(OS_APPLE)
@@ -131,9 +131,9 @@
malloc_statistics_t stats = {0};
malloc_zone_statistics(nullptr, &stats);
return stats.size_in_use;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
return GetMallocUsageMallinfo();
-#elif defined(OS_FUCHSIA)
+#else
-#elif BUILDFLAG(IS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
return 0;
#endif
Expand Down
Loading

0 comments on commit 2e084a1

Please sign in to comment.