From 5d35c60d768ee8c9f45ea15aabf97ae9cf7187b1 Mon Sep 17 00:00:00 2001
|
From: Khem Raj <raj.khem@gmail.com>
|
Date: Wed, 13 Feb 2019 09:51:14 -0800
|
Subject: [PATCH] gnu_libc_version API is glibc specific
|
|
Do not assume it to be linux wide
|
|
Upstream-Status: Pending
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
---
|
.../metrics/chrome_browser_main_extra_parts_metrics.cc | 10 ++++++----
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
@@ -61,8 +61,9 @@
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
// of lacros-chrome is complete.
|
#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
+#if defined(__GLIBC__)
|
#include <gnu/libc-version.h>
|
-
|
+#endif
|
#include "base/linux_util.h"
|
#include "base/strings/string_split.h"
|
#include "base/strings/string_util.h"
|
@@ -246,7 +247,7 @@ void RecordStartupMetrics() {
|
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
// of lacros-chrome is complete.
|
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
+#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
void RecordLinuxDistroSpecific(const std::string& version_string,
|
size_t parts,
|
const char* histogram_name) {
|
@@ -329,7 +330,8 @@ void RecordLinuxDistro() {
|
void RecordLinuxGlibcVersion() {
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
// of lacros-chrome is complete.
|
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
+#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
+
|
base::Version version(gnu_get_libc_version());
|
|
UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
|
@@ -722,7 +724,7 @@ void ChromeBrowserMainExtraPartsMetrics:
|
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN};
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
// of lacros-chrome is complete.
|
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
+#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
base::ThreadPool::PostTask(FROM_HERE, kBestEffortTaskTraits,
|
base::BindOnce(&RecordLinuxDistro));
|
#endif
|
