Skip to content

Commit 06346d7

Browse files
committed
chromium: Forward port musl patches
remove already upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent 1b2a28b commit 06346d7

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ SRC_URI:append:libc-musl = "\
5050
file://musl/0022-sys-stat.patch \
5151
file://musl/scoped-file.patch \
5252
file://musl/fix-narrowing-cast.patch \
53-
file://musl/fix-bits-stdint-intn-include.patch \
5453
"
5554

5655
ANY_OF_DISTRO_FEATURES = "opengl vulkan"

meta-chromium/recipes-browser/chromium/files/musl/0008-gnu_libc_version-API-is-glibc-specific.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1313

1414
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
1515
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
16-
@@ -61,8 +61,9 @@
16+
@@ -62,8 +62,9 @@
1717
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
1818
// of lacros-chrome is complete.
1919
#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -24,7 +24,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2424
#include "base/linux_util.h"
2525
#include "base/strings/string_split.h"
2626
#include "base/strings/string_util.h"
27-
@@ -246,7 +247,7 @@ void RecordStartupMetrics() {
27+
@@ -248,7 +249,7 @@ void RecordStartupMetrics() {
2828

2929
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
3030
// of lacros-chrome is complete.
@@ -33,7 +33,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
3333
void RecordLinuxDistroSpecific(const std::string& version_string,
3434
size_t parts,
3535
const char* histogram_name) {
36-
@@ -329,7 +330,8 @@ void RecordLinuxDistro() {
36+
@@ -331,7 +332,8 @@ void RecordLinuxDistro() {
3737
void RecordLinuxGlibcVersion() {
3838
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
3939
// of lacros-chrome is complete.
@@ -43,7 +43,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
4343
base::Version version(gnu_get_libc_version());
4444

4545
UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
46-
@@ -722,7 +724,7 @@ void ChromeBrowserMainExtraPartsMetrics:
46+
@@ -832,7 +834,7 @@ void ChromeBrowserMainExtraPartsMetrics:
4747
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN};
4848
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
4949
// of lacros-chrome is complete.

meta-chromium/recipes-browser/chromium/files/musl/0009-provide-res_ninit-and-nclose-APIs-on-non-glibc-linux.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
3737

3838
--- a/net/dns/host_resolver_manager.cc
3939
+++ b/net/dns/host_resolver_manager.cc
40-
@@ -2906,8 +2906,7 @@ HostResolverManager::HostResolverManager
40+
@@ -2932,8 +2932,7 @@ HostResolverManager::HostResolverManager
4141
NetworkChangeNotifier::AddConnectionTypeObserver(this);
4242
if (system_dns_config_notifier_)
4343
system_dns_config_notifier_->AddObserver(this);
@@ -53,8 +53,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
5353
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
5454
base::BlockingType::WILL_BLOCK);
5555

56-
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
57-
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
56+
-#if defined(OS_POSIX) && \
57+
- !(defined(OS_APPLE) || defined(OS_OPENBSD) || defined(OS_ANDROID))
5858
+#if defined(__GLIBC__)
5959
DnsReloaderMaybeReload();
6060
#endif

meta-chromium/recipes-browser/chromium/files/musl/fix-bits-stdint-intn-include.patch

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

0 commit comments

Comments
 (0)