...
 
Commits (17)
This diff is collapsed.
out/Release/libwidevinecdmadapter.so usr/lib/chromium
...@@ -6,7 +6,6 @@ chrome/test/data/webui/i18n_process_css_test.html ...@@ -6,7 +6,6 @@ chrome/test/data/webui/i18n_process_css_test.html
third_party/ffmpeg/BUILD.gn third_party/ffmpeg/BUILD.gn
third_party/flac/BUILD.gn third_party/flac/BUILD.gn
third_party/harfbuzz-ng/BUILD.gn
base/third_party/libevent/BUILD.gn base/third_party/libevent/BUILD.gn
build/secondary/third_party/libjpeg_turbo/BUILD.gn build/secondary/third_party/libjpeg_turbo/BUILD.gn
third_party/libdrm/BUILD.gn third_party/libdrm/BUILD.gn
...@@ -20,3 +19,8 @@ third_party/snappy/BUILD.gn ...@@ -20,3 +19,8 @@ third_party/snappy/BUILD.gn
third_party/yasm/yasm_assemble.gni third_party/yasm/yasm_assemble.gni
third_party/zlib/BUILD.gn third_party/zlib/BUILD.gn
third_party/icu/BUILD.gn third_party/icu/BUILD.gn
third_party/opus/BUILD.gn
third_party/freetype/BUILD.gn
third_party/fontconfig/BUILD.gn
build/config/freetype/freetype.gni
third_party/yasm/run_yasm.py
...@@ -72,6 +72,7 @@ Build-Depends: ...@@ -72,6 +72,7 @@ Build-Depends:
libhunspell-dev, libhunspell-dev,
libharfbuzz-dev (>= 1.2.7), libharfbuzz-dev (>= 1.2.7),
libusb-1.0-0-dev, libusb-1.0-0-dev,
libopenjp2-7-dev,
libmodpbase64-dev, libmodpbase64-dev,
libgnome-keyring-dev, libgnome-keyring-dev,
libnss3-dev (>= 3.12.3), libnss3-dev (>= 3.12.3),
...@@ -95,6 +96,7 @@ Depends: ...@@ -95,6 +96,7 @@ Depends:
x11-utils, x11-utils,
xdg-utils, xdg-utils,
Recommends: Recommends:
libgl1-mesa-dri,
fonts-liberation, fonts-liberation,
Suggests: Suggests:
chromium-l10n, chromium-l10n,
......
This diff is collapsed.
description: backport from upstream glibc 2.27 / gcc 7.3 buildfixes form ARM
author: Riku Voipio
--- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
@@ -291,7 +291,7 @@ CAPTURECONTEXT_SYMBOL2:
#elif defined(__aarch64__)
// Zero out fault_address, which is unused.
- str x31, [x0, #0xb0] // context->uc_mcontext.fault_address
+ str xzr, [x0, #0xb0] // context->uc_mcontext.fault_address
// Save general purpose registers in context->uc_mcontext.regs[i].
// The original x0 can't be recovered.
description: Stretch binutils doesn't recognize LR on arm64
author: Riku Voipio
Index: chromium-browser-68.0.3440.75/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
===================================================================
--- chromium-browser-68.0.3440.75.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+++ chromium-browser-68.0.3440.75/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
@@ -312,14 +312,14 @@ CAPTURECONTEXT_SYMBOL2:
stp x28, x29, [x0, #0x198]
// The original LR can't be recovered.
- str LR, [x0, #0x1a8]
+ str x30, [x0, #0x1a8]
// Use x1 as a scratch register.
mov x1, SP
str x1, [x0, #0x1b0] // context->uc_mcontext.sp
// The link register holds the return address for this function.
- str LR, [x0, #0x1b8] // context->uc_mcontext.pc
+ str x30, [x0, #0x1b8] // context->uc_mcontext.pc
// NZCV, pstate, and CPSR are synonyms.
mrs x1, NZCV
description: GCC ICE with optimized version
author: Riku Voipio
bug-debian: http://bugs.debian.org/901290
--- a/third_party/skia/third_party/skcms/skcms.gni
+++ b/third_party/skia/third_party/skcms/skcms.gni
@@ -3,6 +3,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+if ((current_cpu == "arm64" || current_cpu == "arm") && !is_clang) {
+ defines = [ "SKCMS_PORTABLE=1" ]
+}
+
skcms_sources = [
"src/Curve.c",
"src/Curve.h",
description: build fix for armhf
author: Riku Voipio
--- a/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ b/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -653,7 +653,7 @@ SI F approx_powf(F x, F y) {
}
SI F from_half(U16 h) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f32_f16(h);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
@@ -673,7 +673,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f16_f32(f);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
...@@ -4,16 +4,8 @@ Author: Daniel Echeverry <epsilon77@gmail.com> ...@@ -4,16 +4,8 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
--- a/chrome/app/resources/manpage.1.in --- a/chrome/app/resources/manpage.1.in
+++ b/chrome/app/resources/manpage.1.in +++ b/chrome/app/resources/manpage.1.in
@@ -1,5 +1,5 @@
-." This file is processed by chrome.gyp to generate manpages in the
-." build diretory.
+.\" This file is processed by chrome.gyp to generate manpages in the
+.\" build diretory.
.TH @@FILENAME@@ 1 "" "" "USER COMMANDS"
.SH NAME
@@ -20,6 +20,23 @@ This manpage only describes invocation, @@ -20,6 +20,23 @@ This manpage only describes invocation,
@@NAME@@ has hundreds of undocumented command-line flags that are added @@MENUNAME@@ has hundreds of undocumented command-line flags that are added
and removed at the whim of the developers. Here, we document relatively and removed at the whim of the developers. Here, we document relatively
stable flags. stable flags.
+ +
...@@ -36,7 +28,7 @@ Author: Daniel Echeverry <epsilon77@gmail.com> ...@@ -36,7 +28,7 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
.TP .TP
\fB\-\-user\-data\-dir\fR=\fIDIR\fR \fB\-\-user\-data\-dir\fR=\fIDIR\fR
Specifies the directory that user data (your "profile") is kept in. Specifies the directory that user data (your "profile") is kept in.
@@ -110,6 +127,7 @@ as @@ -114,6 +131,7 @@ as
See the GTK documentation for more: See the GTK documentation for more:
.IP .IP
<http://library.gnome.org/devel/gtk/stable/gtk-running.html> <http://library.gnome.org/devel/gtk/stable/gtk-running.html>
......
...@@ -9,7 +9,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -9,7 +9,7 @@ author: Michael Gilbert <mgilbert@debian.org>
base::FilePath MasterPrefsPath() { base::FilePath MasterPrefsPath() {
- // The standard location of the master prefs is next to the chrome binary. - // The standard location of the master prefs is next to the chrome binary.
- base::FilePath master_prefs; - base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs)) - if (!base::PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath(); - return base::FilePath();
- return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); - return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
+ return base::FilePath("/usr/share/chromium/master_preferences"); + return base::FilePath("/usr/share/chromium/master_preferences");
......
--- a/device/vr/buildflags/buildflags.gni
+++ b/device/vr/buildflags/buildflags.gni
@@ -5,7 +5,6 @@
import("//build/config/chrome_build.gni")
import("//build/config/chromecast_build.gni")
import("//build/config/gclient_args.gni")
-import("//chrome/android/channel.gni")
declare_args() {
# TODO(733935): Enable for other Android architectures too. Currently we only
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -365,7 +365,7 @@ group("gn_all") {
# seems currently broken for this platform at the moment, and the
# corresponding code build and works on Linux unmodified.
# See instructions in the corresponding BUILD.gn.
- if (is_linux) {
+ if (is_android) {
deps +=
[ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ]
}
author: Michael Gilbert <mgilbert@debian.org>
description: disable loading external components
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -41,21 +41,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
-#if defined(GOOGLE_CHROME_BUILD)
- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
-#endif // defined(GOOGLE_CHROME_BUILD)
-
- if (HotwordServiceFactory::IsHotwordAllowed(profile_))
- AddExternalExtension(extension_misc::kHotwordSharedModuleId);
-
-#if defined(OS_CHROMEOS)
- {
- base::CommandLine* const command_line =
- base::CommandLine::ForCurrentProcess();
- if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker))
- AddExternalExtension(extension_misc::kZIPUnpackerExtensionId);
- }
-#endif
#if defined(ENABLE_MEDIA_ROUTER)
if (media_router::MediaRouterEnabled(profile_) &&
@@ -64,12 +49,6 @@ void ExternalComponentLoader::StartLoadi
}
#endif // defined(ENABLE_MEDIA_ROUTER)
-#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
- std::string google_now_extension_id;
- if (GetGoogleNowExtensionId(&google_now_extension_id))
- AddExternalExtension(google_now_extension_id);
-#endif
-
LoadFinished();
}
description: fuzzers aren't built, so don't depend on them
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -713,8 +713,7 @@ group("gn_all") {
}
}
- if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
- (use_libfuzzer && is_mac)) {
+ if (false) {
deps += [
"//testing/libfuzzer/fuzzers",
"//testing/libfuzzer/tests:libfuzzer_tests",
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -2122,9 +2122,3 @@ test("content_perftests") {
deps += [ "//testing/android/native_test:native_test_native_code" ]
}
}
-
-group("fuzzers") {
- deps = [
- "//content/test/fuzzer",
- ]
-}
--- a/v8/tools/BUILD.gn
+++ b/v8/tools/BUILD.gn
@@ -11,7 +11,6 @@ group("gn_all") {
data_deps = [
":v8_check_static_initializers",
"gcmole:v8_run_gcmole",
- "jsfunfuzz:v8_jsfunfuzz",
]
}
description: disable the google api key warning when those aren't found description: disable the google api key warning when those aren't found
author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -838,8 +838,6 @@ void StartupBrowserCreatorImpl::AddInfoB @@ -899,8 +899,6 @@ void StartupBrowserCreatorImpl::AddInfoB
!command_line_.HasSwitch(switches::kTestType) && chrome::ShowBadFlagsPrompt(web_contents);
!command_line_.HasSwitch(switches::kEnableAutomation)) { InfoBarService* infobar_service =
chrome::ShowBadFlagsPrompt(browser); InfoBarService::FromWebContents(web_contents);
- GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents( - if (!google_apis::HasKeysConfigured())
- browser->tab_strip_model()->GetActiveWebContents())); - GoogleApiKeysInfoBarDelegate::Create(infobar_service);
ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents( if (ObsoleteSystem::IsObsoleteNowOrSoon()) {
browser->tab_strip_model()->GetActiveWebContents())); PrefService* local_state = g_browser_process->local_state();
if (!local_state ||
--- a/third_party/webrtc/webrtc.gni
+++ b/third_party/webrtc/webrtc.gni
@@ -126,7 +126,7 @@ declare_args() {
# also: |rtc_initialize_ffmpeg|.
# CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
# http://www.openh264.org, https://www.ffmpeg.org/
- rtc_use_h264 = proprietary_codecs && !is_android && !is_ios
+ rtc_use_h264 = false
# By default, use normal platform audio support or dummy audio, but don't
# use file-based audio playout and record.
description: disable dependencies on third_party/perfetto
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -659,7 +659,7 @@ group("gn_all") {
}
}
- if (is_mac || is_linux || is_android) {
+ if (false) {
deps += [ "//third_party/perfetto:all" ]
}
--- a/services/tracing/BUILD.gn
+++ b/services/tracing/BUILD.gn
@@ -28,7 +28,7 @@ source_set("lib") {
"//services/tracing/public/cpp",
]
- if (is_mac || is_linux || is_android) {
+ if (false) {
sources += [
"perfetto/json_trace_exporter.cc",
"perfetto/json_trace_exporter.h",
@@ -99,7 +99,7 @@ source_set("tests") {
"//testing/gtest",
]
- if (is_mac || is_linux || is_android) {
+ if (false) {
sources += [
"perfetto/json_trace_exporter_unittest.cc",
"perfetto/perfetto_integration_unittest.cc",
--- a/services/tracing/public/cpp/BUILD.gn
+++ b/services/tracing/public/cpp/BUILD.gn
@@ -22,7 +22,7 @@ component("cpp") {
"//services/tracing/public/mojom",
]
- if (is_mac || is_linux || is_android) {
+ if (false) {
sources += [
"perfetto/producer_client.cc",
"perfetto/producer_client.h",
--- a/services/tracing/tracing_service.cc
+++ b/services/tracing/tracing_service.cc
@@ -12,7 +12,7 @@
#include "services/tracing/coordinator.h"
#include "services/tracing/public/cpp/tracing_features.h"
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if 0
#include "services/tracing/perfetto/perfetto_service.h"
#include "services/tracing/perfetto/perfetto_tracing_coordinator.h"
#endif
@@ -26,7 +26,7 @@ std::unique_ptr<service_manager::Service
TracingService::TracingService() : weak_factory_(this) {}
TracingService::~TracingService() {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if 0
if (perfetto_tracing_coordinator_) {
PerfettoTracingCoordinator::DestroyOnSequence(
std::move(perfetto_tracing_coordinator_));
@@ -48,7 +48,7 @@ void TracingService::OnStart() {
base::Unretained(tracing_agent_registry_.get())));
if (TracingUsesPerfettoBackend()) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if 0
perfetto_service_ = std::make_unique<tracing::PerfettoService>();
registry_.AddInterface(
base::BindRepeating(&tracing::PerfettoService::BindRequest,
--- a/services/tracing/tracing_service.h
+++ b/services/tracing/tracing_service.h
@@ -50,7 +50,7 @@ class TracingService : public service_ma
std::unique_ptr<Coordinator> tracing_coordinator_;
std::unique_ptr<service_manager::ServiceContextRefFactory> ref_factory_;
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if 0
std::unique_ptr<tracing::PerfettoService> perfetto_service_;
std::unique_ptr<PerfettoTracingCoordinator> perfetto_tracing_coordinator_;
#endif
--- a/services/tracing/public/cpp/trace_event_agent.cc
+++ b/services/tracing/public/cpp/trace_event_agent.cc
@@ -21,7 +21,7 @@
#include "services/tracing/public/cpp/tracing_features.h"
#include "services/tracing/public/mojom/constants.mojom.h"
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if 0
#include "services/tracing/public/cpp/perfetto/producer_client.h"
#endif
@@ -33,7 +33,7 @@ const char kTraceEventLabel[] = "traceEv
namespace tracing {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if 0
class PerfettoTraceEventAgent : public TraceEventAgent {
public:
explicit PerfettoTraceEventAgent(service_manager::Connector* connector) {
@@ -65,7 +65,7 @@ std::unique_ptr<TraceEventAgent> TraceEv
service_manager::Connector* connector,
bool request_clock_sync_marker_on_android) {
if (TracingUsesPerfettoBackend()) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if 0
return std::make_unique<PerfettoTraceEventAgent>(connector);
#else
LOG(FATAL) << "Perfetto is not yet available for this platform.";
author: Michael Gilbert <mgilbert@debian.org>
description: disable the ad promo system by default
bug-debian: http://bugs.debian.org/634101
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefR
// Identifies whether we should show the app launcher promo or not. This
// becomes false when the user dismisses the promo.
- registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
+ registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
}
// static
...@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller@canonical.com> ...@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller@canonical.com>
--- a/components/content_settings/core/browser/cookie_settings.cc --- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -79,7 +79,7 @@ void CookieSettings::GetCookieSettings( @@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs( void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) { user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref( registry->RegisterBooleanPref(
......
description: fix ambiguous namespace alias errors that occur in jumbo build
author: Michael Gilbert <mgilbert@debian.org>
--- a/extensions/common/manifest_handlers/permissions_parser.cc
+++ b/extensions/common/manifest_handlers/permissions_parser.cc
@@ -28,10 +28,10 @@
#include "extensions/common/url_pattern_set.h"
#include "url/url_constants.h"
-namespace extensions {
+namespace keys = extensions::manifest_keys;
+namespace errors = extensions::manifest_errors;
-namespace keys = manifest_keys;
-namespace errors = manifest_errors;
+namespace extensions {
namespace {
--- a/extensions/common/manifest_handlers/requirements_info.cc
+++ b/extensions/common/manifest_handlers/requirements_info.cc
@@ -12,10 +12,10 @@
#include "extensions/common/error_utils.h"
#include "extensions/common/manifest_constants.h"
-namespace extensions {
+namespace keys = extensions::manifest_keys;
+namespace errors = extensions::manifest_errors;
-namespace keys = manifest_keys;
-namespace errors = manifest_errors;
+namespace extensions {
RequirementsInfo::RequirementsInfo(const Manifest* manifest)
: webgl(false), window_shape(false) {}
--- a/extensions/common/manifest_handlers/sandboxed_page_info.cc
+++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc
@@ -17,10 +17,10 @@
#include "extensions/common/manifest_constants.h"
#include "extensions/common/url_pattern.h"
-namespace extensions {
-
namespace keys = extensions::manifest_keys;
-namespace errors = manifest_errors;
+namespace errors = extensions::manifest_errors;
+
+namespace extensions {
namespace {
--- a/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/extensions/common/manifest_handlers/shared_module_info.cc
@@ -22,11 +22,11 @@
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h"
-namespace extensions {
+namespace keys = extensions::manifest_keys;
+namespace values = extensions::manifest_values;
+namespace errors = extensions::manifest_errors;
-namespace keys = manifest_keys;
-namespace values = manifest_values;
-namespace errors = manifest_errors;
+namespace extensions {
namespace {
description: some libraries fail to link when --as-needed is set
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -385,7 +385,7 @@ config("compiler") {
if (!using_sanitizer) {
ldflags += [
"-Wl,-z,defs",
- "-Wl,--as-needed",
+ "-Wl,--no-as-needed",
]
}
}
description: set chromedriver version as undefined description: set chromedriver version as undefined
author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/test/chromedriver/embed_version_in_cpp.py --- a/chrome/test/chromedriver/embed_version_in_cpp.py
+++ b/chrome/test/chromedriver/embed_version_in_cpp.py +++ b/chrome/test/chromedriver/embed_version_in_cpp.py
......
description: fix inverted check
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/crc32c/src/include/crc32c/crc32c.h
+++ b/third_party/crc32c/src/include/crc32c/crc32c.h
@@ -37,7 +37,7 @@ inline uint32_t Crc32c(const std::string
#if __has_include(<string_view>)
// Visual Studio provides a <string_view> header even in C++11 mode. When
// included, the header issues an #error. (C1189)
-#if !defined(_MSC_VER) || __cplusplus >= 201703L
+#if !defined(_MSC_VER) && __cplusplus >= 201703L
#include <string_view>
// Comptues the CRC32C of the bytes in the string_view.
description: dma-buf.h is not provided by linux-libc-dev until version 4.11 in debian
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
@@ -17,7 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
#include <linux/types.h>
struct local_dma_buf_sync {
...@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940 ...@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940
--- a/gpu/ipc/service/gpu_watchdog_thread.cc --- a/gpu/ipc/service/gpu_watchdog_thread.cc
+++ b/gpu/ipc/service/gpu_watchdog_thread.cc +++ b/gpu/ipc/service/gpu_watchdog_thread.cc
@@ -41,7 +41,7 @@ const int kGpuTimeout = 30000; @@ -42,7 +42,7 @@ const int kGpuTimeout = 30000;
// infected machines. // infected machines.
const int kGpuTimeout = 15000; const int kGpuTimeout = 15000;
#else #else
......
description: better integration with gtk3 themes
origin: https://bugs.archlinux.org/task/47682
--- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
@@ -138,6 +138,11 @@ SkColor GetBGColor(GtkWidget* widget, Wi
gtk_widget_get_style_context(widget), stateMap[state], &color);
G_GNUC_END_IGNORE_DEPRECATIONS
+ if (color.alpha == 0.0)
+ gtk_style_context_get_background_color(
+ gtk_widget_get_style_context(gtk_widget_get_toplevel(widget)),
+ stateMap[state], &color);
+
// Hack for default color
if (color.alpha == 0.0)
color = {1, 1, 1, 1};
@@ -507,8 +512,11 @@ GtkWidget* NativeThemeGtk2::GetEntry() c
GtkWidget* NativeThemeGtk2::GetLabel() const {
static GtkWidget* fake_label = NULL;
- if (!fake_label)
+ if (!fake_label) {
fake_label = gtk_label_new("");
+ gtk_style_context_add_class(
+ gtk_widget_get_style_context(fake_label), "gtkstyle-fallback");
+ }
return fake_label;
}
description: fix includes that cause errors in jumbo builds
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/fonts/font_cache_key.h
+++ b/third_party/blink/renderer/platform/fonts/font_cache_key.h
@@ -36,7 +36,6 @@
#include "third_party/blink/renderer/platform/wtf/allocator.h"
#include "third_party/blink/renderer/platform/wtf/hash_map.h"
#include "third_party/blink/renderer/platform/wtf/hash_table_deleted_value_type.h"
-#include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
namespace blink {
--- a/third_party/blink/renderer/platform/text/hyphenation.h
+++ b/third_party/blink/renderer/platform/text/hyphenation.h
@@ -9,7 +9,7 @@
#include "third_party/blink/renderer/platform/wtf/forward.h"
#include "third_party/blink/renderer/platform/wtf/hash_map.h"
#include "third_party/blink/renderer/platform/wtf/ref_counted.h"
-#include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
+#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
namespace blink {
description: use inspector_protocol from top level third_party dir
author: Michael Gilbert <mgilbert@debian.org>
--- a/v8/src/inspector/BUILD.gn
+++ b/v8/src/inspector/BUILD.gn
@@ -4,7 +4,7 @@
import("../../gni/v8.gni")
-_inspector_protocol = v8_path_prefix + "/third_party/inspector_protocol"
+_inspector_protocol = "../../../third_party/inspector_protocol"
import("$_inspector_protocol/inspector_protocol.gni")
_protocol_generated = [
@@ -30,7 +30,7 @@ _protocol_generated = [
action("protocol_compatibility") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
- script = "$_inspector_protocol/CheckProtocolCompatibility.py"
+ script = "$_inspector_protocol/check_protocol_compatibility.py"
inputs = [
"js_protocol.json",
]
description: map doesn't support insertion from a pair in gcc 6
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/browser/background_fetch/background_fetch_context.cc
+++ b/content/browser/background_fetch/background_fetch_context.cc
@@ -218,7 +218,7 @@ void BackgroundFetchContext::InitializeC
scheduler_->AddJobController(controller.get());
- job_controllers_.insert({unique_id, std::move(controller)});
+ job_controllers_[unique_id] = std::move(controller);
std::move(done_closure).Run();
}
--- a/content/renderer/input/input_event_prediction.cc
+++ b/content/renderer/input/input_event_prediction.cc
@@ -119,7 +119,7 @@ void InputEventPrediction::UpdateSingleP
if (predictor != pointer_id_predictor_map_.end()) {
predictor->second->Update(data);
} else {
- pointer_id_predictor_map_.insert({event.id, SetUpPredictor()});
+ pointer_id_predictor_map_[event.id] = SetUpPredictor();
pointer_id_predictor_map_[event.id]->Update(data);
}
}
--- a/components/bookmarks/browser/bookmark_storage.h
+++ b/components/bookmarks/browser/bookmark_storage.h
@@ -18,6 +18,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "components/bookmarks/browser/bookmark_node.h"
+#include "components/bookmarks/browser/url_index.h"
#include "components/bookmarks/browser/titled_url_index.h"
namespace base {
@@ -29,7 +30,7 @@ namespace bookmarks {
class BookmarkClient;
class BookmarkModel;
class BookmarkNode;
-class UrlIndex;
+#include "components/bookmarks/browser/url_index.h"
// A list of BookmarkPermanentNodes that owns them.
using BookmarkPermanentNodeList =
--- a/services/network/public/cpp/cors/cors_legacy.h
+++ b/services/network/public/cpp/cors/cors_legacy.h
@@ -5,6 +5,7 @@
#ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
#define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+#include <string>
#include <vector>
#include "base/component_export.h"
description: fix mojo layout test build error
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -112,8 +112,6 @@ static_library("content_shell_lib") {
"browser/layout_test/layout_test_url_request_context_getter.h",
"browser/layout_test/leak_detector.cc",
"browser/layout_test/leak_detector.h",
- "browser/layout_test/mojo_layout_test_helper.cc",
- "browser/layout_test/mojo_layout_test_helper.h",
"browser/layout_test/secondary_test_window_observer.cc",
"browser/layout_test/secondary_test_window_observer.h",
"browser/layout_test/test_info_extractor.cc",
@@ -262,9 +260,7 @@ static_library("content_shell_lib") {
"//content/public/common",
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",
- "//content/test:content_test_mojo_bindings",
"//content/test:layouttest_support",
- "//content/test:mojo_layouttest_bindings",
"//content/test:test_support",
"//device/bluetooth",
"//device/bluetooth:fake_bluetooth",
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -21,7 +21,6 @@
#include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
#include "content/shell/browser/layout_test/layout_test_message_filter.h"
#include "content/shell/browser/layout_test/layout_test_notification_manager.h"
-#include "content/shell/browser/layout_test/mojo_layout_test_helper.h"
#include "content/shell/browser/shell_browser_context.h"
#include "content/shell/common/layout_test/layout_test_switches.h"
#include "content/shell/common/shell_messages.h"
@@ -37,11 +36,6 @@ namespace {
LayoutTestContentBrowserClient* g_layout_test_browser_client;
-void BindLayoutTestHelper(mojom::MojoLayoutTestHelperRequest request,
- RenderFrameHost* render_frame_host) {
- MojoLayoutTestHelper::Create(std::move(request));
-}
-
class WebPackageInternalsImpl : public blink::test::mojom::WebPackageInternals {
public:
explicit WebPackageInternalsImpl(WebPackageContext* web_package_context)
@@ -152,7 +146,6 @@ void LayoutTestContentBrowserClient::Exp
&WebPackageInternalsImpl::Create,
base::Unretained(
render_process_host->GetStoragePartition()->GetWebPackageContext())));
- registry->AddInterface(base::BindRepeating(&MojoLayoutTestHelper::Create));
registry->AddInterface(
base::BindRepeating(&LayoutTestContentBrowserClient::BindClipboardHost,
base::Unretained(this)),
@@ -257,7 +250,6 @@ bool LayoutTestContentBrowserClient::Can
void LayoutTestContentBrowserClient::ExposeInterfacesToFrame(
service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
registry) {
- registry->AddInterface(base::Bind(&BindLayoutTestHelper));
}
scoped_refptr<LoginDelegate>
description: gcc 6 isn't able to correctly deduce the namespace
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/graphics/path.h
+++ b/third_party/blink/renderer/platform/graphics/path.h
@@ -199,13 +199,13 @@ class PLATFORM_EXPORT Path {
SkPath path_;
};
-class PLATFORM_EXPORT RefCountedPath : public Path,
+class PLATFORM_EXPORT RefCountedPath : public blink::Path,
public RefCounted<RefCountedPath> {
USING_FAST_MALLOC(RefCountedPath);
public:
template <typename... Args>
- RefCountedPath(Args&&... args) : Path(std::forward<Args>(args)...) {}
+ RefCountedPath(Args&&... args) : blink::Path(std::forward<Args>(args)...) {}
};
// Only used for DCHECKs
description: add missing variable declaration
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -74,6 +74,8 @@ declare_args() {
msvs_xtree_patched = false
}
+ optimize_for_size = true
+
# Enable fatal linker warnings. Building Chromium with certain versions
# of binutils can cause linker warning.
# See: https://bugs.chromium.org/p/chromium/issues/detail?id=457359
...@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso ...@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc --- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc +++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
@@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog( @@ -350,6 +350,7 @@ void PrintDialogGtk2::ShowDialog(
// Since we only generate PDF, only show printers that support PDF. // Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support? // TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
......
description: size_t is not in scope by default in gcc 6
author: Michael Gilbert <mgilbert@debian.org>
--- a/media/base/subsample_entry.h
+++ b/media/base/subsample_entry.h
@@ -35,7 +35,7 @@ struct SubsampleEntry {
// does not match |input_size|.
MEDIA_EXPORT bool VerifySubsamplesMatchSize(
const std::vector<SubsampleEntry>& subsamples,
- size_t input_size);
+ std::size_t input_size);
} // namespace media
--- a/base/strings/string_piece.h
+++ b/base/strings/string_piece.h
@@ -382,8 +382,8 @@ BasicStringPiece<STRING_TYPE>::npos =
// MSVC doesn't like complex extern templates and DLLs.
#if !defined(COMPILER_MSVC)
-extern template class BASE_EXPORT BasicStringPiece<std::string>;
-extern template class BASE_EXPORT BasicStringPiece<string16>;
+//extern template class BASE_EXPORT BasicStringPiece<std::string>;
+//extern template class BASE_EXPORT BasicStringPiece<string16>;
#endif
// StingPiece operators --------------------------------------------------------
description: indicate that widevine continues to be supported on linux
author: Gregory M. Turner
origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/www-client/chromium/files?id=09b804516320eee06930303870cd68008aac8a8a
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widev
# Internal Cast builds set enable_widevine=true to bring in Widevine support.
# TODO(xhwang): Support component updated CDM on other platforms and remove this
# assert.
-assert(!enable_widevine || is_win || is_mac || is_chromecast,
+assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
"Component updated CDM only supported on Windows and Mac for now.")
widevine_arch = current_cpu
description: fix errors in gn's bootstrapping script
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -451,7 +451,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/memory/ref_counted_memory.cc',
'base/memory/singleton.cc',
'base/memory/shared_memory_handle.cc',
- 'base/memory/shared_memory_tracker.cc',
'base/memory/weak_ptr.cc',
'base/message_loop/incoming_task_queue.cc',
'base/message_loop/message_loop.cc',
@@ -460,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/message_loop/message_pump_default.cc',
'base/metrics/bucket_ranges.cc',
'base/metrics/field_trial.cc',
+ 'base/metrics/field_trial_params.cc',
'base/metrics/field_trial_param_associator.cc',
'base/metrics/histogram.cc',
'base/metrics/histogram_base.cc',
@@ -510,6 +510,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/task_scheduler/scheduler_lock_impl.cc',
'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
'base/task_scheduler/scheduler_worker.cc',
+ 'base/task_scheduler/scheduler_worker_pool.cc',
'base/task_scheduler/scheduler_worker_pool_impl.cc',
'base/task_scheduler/scheduler_worker_pool_params.cc',
'base/task_scheduler/scheduler_worker_stack.cc',
@@ -529,6 +530,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/sequence_local_storage_map.cc',
'base/threading/sequenced_task_runner_handle.cc',
'base/threading/sequenced_worker_pool.cc',
+ 'base/threading/scoped_blocking_call.cc',
'base/threading/simple_thread.cc',
'base/threading/thread.cc',
'base/threading/thread_checker_impl.cc',
@@ -580,7 +582,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/tracked_objects.cc',
'base/tracking_info.cc',
'base/unguessable_token.cc',
- 'base/value_iterators.cc',
'base/values.cc',
'base/value_iterators.cc',
'base/vlog.cc',
...@@ -27,7 +27,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -27,7 +27,7 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = { toolchain_args = {
current_cpu = "arm" current_cpu = "arm"
current_os = "linux" current_os = "linux"
@@ -95,6 +105,10 @@ gcc_toolchain("x86") { @@ -103,6 +113,10 @@ gcc_toolchain("x86") {
# Output linker map files for binary size analysis. # Output linker map files for binary size analysis.
enable_linker_map = true enable_linker_map = true
...@@ -38,7 +38,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -38,7 +38,7 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = { toolchain_args = {
current_cpu = "x86" current_cpu = "x86"
current_os = "linux" current_os = "linux"
@@ -140,6 +154,10 @@ gcc_toolchain("x64") { @@ -156,6 +170,10 @@ gcc_toolchain("x64") {
# Output linker map files for binary size analysis. # Output linker map files for binary size analysis.
enable_linker_map = true enable_linker_map = true
......
description: avoid chromium's embedded C++ library when bootstrapping gn
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -730,6 +730,8 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux or is_aix:
+ ldflags.extend(['-pthread'])
+
static_libraries['xdg_user_dirs'] = {
'sources': [
'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
@@ -755,85 +757,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc',
])
if is_linux:
- libcxx_root = SRC_ROOT + '/buildtools/third_party/libc++/trunk'
- libcxxabi_root = SRC_ROOT + '/buildtools/third_party/libc++abi/trunk'
- cflags_cc.extend([
- '-nostdinc++',
- '-isystem' + libcxx_root + '/include',
- '-isystem' + libcxxabi_root + '/include',
- ])
- ldflags.extend(['-nodefaultlibs'])
- libs.extend([
- '-lc',
- '-lgcc_s',
- '-lm',
- '-lpthread',
- ])
- static_libraries['libc++'] = {
- 'sources': [
- libcxx_root + '/src/algorithm.cpp',
- libcxx_root + '/src/any.cpp',
- libcxx_root + '/src/bind.cpp',
- libcxx_root + '/src/chrono.cpp',
- libcxx_root + '/src/condition_variable.cpp',
- libcxx_root + '/src/debug.cpp',
- libcxx_root + '/src/exception.cpp',
- libcxx_root + '/src/functional.cpp',
- libcxx_root + '/src/future.cpp',
- libcxx_root + '/src/hash.cpp',
- libcxx_root + '/src/ios.cpp',
- libcxx_root + '/src/iostream.cpp',
- libcxx_root + '/src/locale.cpp',
- libcxx_root + '/src/memory.cpp',
- libcxx_root + '/src/mutex.cpp',
- libcxx_root + '/src/new.cpp',
- libcxx_root + '/src/optional.cpp',
- libcxx_root + '/src/random.cpp',
- libcxx_root + '/src/regex.cpp',
- libcxx_root + '/src/shared_mutex.cpp',
- libcxx_root + '/src/stdexcept.cpp',
- libcxx_root + '/src/string.cpp',
- libcxx_root + '/src/strstream.cpp',
- libcxx_root + '/src/system_error.cpp',
- libcxx_root + '/src/thread.cpp',
- libcxx_root + '/src/typeinfo.cpp',
- libcxx_root + '/src/utility.cpp',
- libcxx_root + '/src/valarray.cpp',
- libcxx_root + '/src/variant.cpp',
- libcxx_root + '/src/vector.cpp',
- ],
- 'tool': 'cxx',
- 'cflags': cflags + [
- '-D_LIBCPP_NO_EXCEPTIONS',
- '-D_LIBCPP_BUILDING_LIBRARY',
- '-DLIBCXX_BUILDING_LIBCXXABI',
- ]
- }
- static_libraries['libc++abi'] = {
- 'sources': [
- libcxxabi_root + '/src/abort_message.cpp',
- libcxxabi_root + '/src/cxa_aux_runtime.cpp',
- libcxxabi_root + '/src/cxa_default_handlers.cpp',
- libcxxabi_root + '/src/cxa_demangle.cpp',
- libcxxabi_root + '/src/cxa_exception_storage.cpp',
- libcxxabi_root + '/src/cxa_guard.cpp',
- libcxxabi_root + '/src/cxa_handlers.cpp',
- libcxxabi_root + '/src/cxa_noexception.cpp',
- libcxxabi_root + '/src/cxa_unexpected.cpp',
- libcxxabi_root + '/src/cxa_vector.cpp',
- libcxxabi_root + '/src/cxa_virtual.cpp',
- libcxxabi_root + '/src/fallback_malloc.cpp',
- libcxxabi_root + '/src/private_typeinfo.cpp',
- libcxxabi_root + '/src/stdlib_exception.cpp',
- libcxxabi_root + '/src/stdlib_stdexcept.cpp',
- libcxxabi_root + '/src/stdlib_typeinfo.cpp',
- ],
- 'tool': 'cxx',
- 'cflags': cflags + [
- '-DLIBCXXABI_SILENT_TERMINATE',
- '-D_LIBCXXABI_NO_EXCEPTIONS',
- ]
- }
static_libraries['base']['sources'].extend([
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
...@@ -3,16 +3,16 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -3,16 +3,16 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py --- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py
@@ -102,6 +102,7 @@ def main(argv): @@ -156,6 +156,7 @@ def main(argv):
parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args') 'the out_bootstrap to be located in the parent directory')
parser.add_option('-v', '--verbose', action='store_true', parser.add_option('-v', '--verbose', action='store_true',
help='Log more details') help='Log more details')
+ parser.add_option('-j', '--jobs', help='Number of jobs') + parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv) options, args = parser.parse_args(argv)
if args: if args:
@@ -199,6 +200,8 @@ def build_gn_with_ninja_manually(tempdir @@ -284,6 +285,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir] cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
if options.verbose: if options.verbose:
cmd.append('-v') cmd.append('-v')
+ if options.jobs: + if options.jobs:
......
manpage.patch debianization/manpage.patch
master-preferences.patch debianization/master-preferences.patch
gn/libcxx.patch
gn/parallel.patch gn/parallel.patch
gn/buildflags.patch gn/buildflags.patch
disable/promo.patch arm/skia.patch
disable/google-api-warning.patch arm/crashpad.patch
disable/third-party-cookies.patch arm/gcc_skcms_ice.patch
disable/external-components.patch arm/crashpad_binutils.patch
fixes/dma.patch fixes/mojo.patch
fixes/sizet.patch
fixes/widevine.patch
fixes/optimize.patch
fixes/ps-print.patch fixes/ps-print.patch
fixes/as-needed.patch
fixes/namespace.patch
fixes/inspector.patch
fixes/gpu-timeout.patch fixes/gpu-timeout.patch
fixes/stringpiece.patch
fixes/map-insertion.patch
fixes/missing-includes.patch
fixes/ambiguous-aliases.patch
fixes/widevine-revision.patch fixes/widevine-revision.patch
fixes/include-collisions.patch
fixes/chromedriver-revision.patch fixes/chromedriver-revision.patch
system/icu.patch disable/android.patch
disable/fuzzers.patch
disable/openh264.patch
disable/perfetto.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
system/vpx16.patch
system/vpx.patch system/vpx.patch
system/icu.patch
system/jpeg.patch
system/webp.patch
system/nspr.patch system/nspr.patch
system/zlib.patch
system/event.patch system/event.patch
system/libxml.patch system/libdrm.patch
system/ffmpeg.patch system/ffmpeg.patch
system/ffmpeg34.patch
system/fontconfig.patch
system/openjpeg.patch
system/openjpeg21.patch
description: class definitions were defined outside of namespace when using gtk2
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/accessibility/platform/atk_util_auralinux_gtk2.cc
+++ b/ui/accessibility/platform/atk_util_auralinux_gtk2.cc
@@ -56,6 +56,8 @@ void FinishAccessibilityInitOnMainThread
init_func();
}
+namespace ui {
+
bool AtkUtilAuraLinux::PlatformShouldEnableAccessibility() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
std::string gtk_modules;
@@ -78,3 +80,5 @@ void AtkUtilAuraLinux::PlatformInitializ
base::Bind(&GetAccessibilityModuleInitFunc),
base::Bind(&FinishAccessibilityInitOnMainThread));
}
+
+}
description: build using system libevent description: build using system libevent
author: Michael Gilbert <mgilbert@debian.org> author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/base/task_queue_libevent.cc --- a/third_party/webrtc/rtc_base/task_queue_libevent.cc
+++ b/third_party/webrtc/base/task_queue_libevent.cc +++ b/third_party/webrtc/rtc_base/task_queue_libevent.cc
@@ -15,7 +15,7 @@ @@ -16,7 +16,7 @@
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <list>
-#include "base/third_party/libevent/event.h" -#include "base/third_party/libevent/event.h"
+#include <event.h> +#include <event.h>
#include "webrtc/base/checks.h" #include "rtc_base/checks.h"
#include "webrtc/base/logging.h" #include "rtc_base/criticalsection.h"
#include "webrtc/base/task_queue_posix.h" #include "rtc_base/logging.h"
--- a/tools/gn/bootstrap/bootstrap.py --- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py
@@ -578,29 +578,9 @@ def write_gn_ninja(path, root_gen_dir, o @@ -710,26 +710,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_posix.cc', 'base/threading/thread_local_storage_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc', 'base/time/time_conversion_posix.cc',
]) ])
- static_libraries['libevent'] = { - static_libraries['libevent'] = {
- 'sources': [ - 'sources': [
...@@ -39,29 +39,26 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -39,29 +39,26 @@ author: Michael Gilbert <mgilbert@debian.org>
- 'cflags': cflags + ['-DHAVE_CONFIG_H'], - 'cflags': cflags + ['-DHAVE_CONFIG_H'],
- } - }
if is_linux: if is_linux or is_aix:
- libs.extend(['-lrt', '-latomic', '-lnspr4'])
+ libs.extend(['-lrt', '-latomic', '-lnspr4', '-levent'])
ldflags.extend(['-pthread']) ldflags.extend(['-pthread'])
@@ -763,13 +743,7 @@ def write_gn_ninja(path, root_gen_dir, o
static_libraries['xdg_user_dirs'] = { 'base/allocator/allocator_shim.cc',
@@ -627,13 +607,6 @@ def write_gn_ninja(path, root_gen_dir, o 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
'base/threading/platform_thread_linux.cc', ])
'base/trace_event/malloc_dump_provider.cc', - libs.extend(['-lrt', '-latomic', '-lnspr4'])
]) - static_libraries['libevent']['include_dirs'].extend([
- static_libraries['libevent']['include_dirs'].extend([ - os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux') - ])
- ]) - static_libraries['libevent']['sources'].extend([
- static_libraries['libevent']['sources'].extend([ - 'base/third_party/libevent/epoll.c',
- 'base/third_party/libevent/epoll.c', - ])
- ]) + libs.extend(['-lrt', '-latomic', '-lnspr4', '-levent'])
- else:
ldflags.extend(['-pthread'])
if is_mac: libs.extend(['-lrt'])
static_libraries['base']['sources'].extend([ @@ -809,12 +783,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -663,12 +636,6 @@ def write_gn_ninja(path, root_gen_dir, o 'base/time/time_mac.cc',
'base/threading/platform_thread_mac.mm', 'base/threading/platform_thread_mac.mm',
'base/trace_event/malloc_dump_provider.cc',
]) ])
- static_libraries['libevent']['include_dirs'].extend([ - static_libraries['libevent']['include_dirs'].extend([
- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac') - os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac')
......
description: don't use ffmpeg's private API, which can change at any time. description: changes required to support ffmpeg 3.2 in stretch
author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> author: Michael Gilbert <mgilbert@debian.org>
--- a/media/ffmpeg/ffmpeg_common.h --- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.cc
@@ -26,7 +26,6 @@ extern "C" { @@ -189,8 +189,6 @@ static VideoCodec CodecIDToVideoCodec(AV
// Disable deprecated features which result in spammy compile warnings. This return kCodecVP8;
// list of defines must mirror those in the 'defines' section of FFmpeg's case AV_CODEC_ID_VP9:
// BUILD.gn file or the headers below will generate different structures! return kCodecVP9;
-#define FF_API_CONVERGENCE_DURATION 0 - case AV_CODEC_ID_AV1:
// Upstream libavcodec/utils.c still uses the deprecated - return kCodecAV1;
// av_dup_packet(), causing deprecation warnings. default:
// The normal fix for such things is to disable the feature as below, DVLOG(1) << "Unknown video CodecID: " << codec_id;
@@ -40,7 +39,6 @@ extern "C" { }
MSVC_PUSH_DISABLE_WARNING(4244); @@ -213,8 +211,6 @@ AVCodecID VideoCodecToCodecID(VideoCodec
#include <libavcodec/avcodec.h> return AV_CODEC_ID_VP8;
#include <libavformat/avformat.h> case kCodecVP9:
-#include <libavformat/internal.h> return AV_CODEC_ID_VP9;
#include <libavformat/avio.h> - case kCodecAV1:
#include <libavutil/avutil.h> - return AV_CODEC_ID_AV1;
#include <libavutil/imgutils.h> default:
--- a/media/filters/ffmpeg_demuxer.cc DVLOG(1) << "Unknown VideoCodec: " << video_codec;
+++ b/media/filters/ffmpeg_demuxer.cc }
@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone description: system ffmpeg build still relies on old ffmpeg_features label
// If no estimate is found, the stream entry will be kInfiniteDuration. author: chromium 65 authors
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration); --- a/build/linux/unbundle/ffmpeg.gn
- const AVFormatInternal* internal = format_context->internal; +++ b/build/linux/unbundle/ffmpeg.gn
- if (internal && internal->packet_buffer && @@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") {
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { ]
- struct AVPacketList* packet_buffer = internal->packet_buffer; }
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -buildflag_header("ffmpeg_buildflags") {
- start_time_estimates.size()); - header = "ffmpeg_buildflags.h"
- const AVStream* stream = +buildflag_header("ffmpeg_features") {
- format_context->streams[packet_buffer->pkt.stream_index]; + header = "ffmpeg_features.h"
- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { flags = [ "USE_SYSTEM_FFMPEG=true" ]
- const base::TimeDelta packet_pts = }
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
- // https://crbug.com/700501. Technically this is a valid value, but in
- // practice shouldn't occur, so just ignore it when estimating.
- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
- packet_pts < start_time_estimates[stream->index]) {
- start_time_estimates[stream->index] = packet_pts;
- }
- }
- packet_buffer = packet_buffer->next;
- }
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); @@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") {
source_set("ffmpeg") {
deps = [
- ":ffmpeg_buildflags",
+ ":ffmpeg_features",
":ffmpeg_shim",
]
public_configs = [ ":system_ffmpeg" ]
description: ffmpeg before version 4.0 requires explicit initialization
author: Michael Gilbert <mgilbert@debian.org>
origin: chromium 66 authors
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -80,6 +80,8 @@ void FFmpegAudioDecoder::Initialize(
return;
}
+ FFmpegGlue::InitializeFFmpeg();
+
if (!ConfigureDecoder(config)) {
av_sample_format_ = 0;
bound_init_cb.Run(false);
--- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -222,10 +222,13 @@ void ConvertCdmKeysInfo(const media::Cdm
}
}
+#include <libavformat/avformat.h>
+
void INITIALIZE_CDM_MODULE() {
DVLOG(1) << __func__;
#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
media::InitializeMediaLibrary();
+ av_register_all();
#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
g_is_cdm_module_initialized = true;
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -63,6 +63,10 @@ static int64_t AVIOSeekOperation(void* o
return new_offset;
}
+void FFmpegGlue::InitializeFFmpeg() {
+ av_register_all();
+}
+
FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
// Initialize an AVIOContext using our custom read and seek operations. Don't
// keep pointers to the buffer since FFmpeg may reallocate it on the fly. It
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -59,6 +59,8 @@ class MEDIA_EXPORT FFmpegURLProtocol {
class MEDIA_EXPORT FFmpegGlue {
public:
+ static void InitializeFFmpeg();
+
// See file documentation for usage. |protocol| must outlive FFmpegGlue.
explicit FFmpegGlue(FFmpegURLProtocol* protocol);
~FFmpegGlue();
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -28,6 +28,7 @@
#include "media/base/video_util.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/ffmpeg/ffmpeg_decoding_loop.h"
+#include "media/filters/ffmpeg_glue.h"
namespace media {
@@ -110,6 +111,7 @@ static void ReleaseVideoBufferImpl(void*
// static
bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
+ FFmpegGlue::InitializeFFmpeg();
return avcodec_find_decoder(VideoCodecToCodecID(codec)) != nullptr;
}
@@ -252,6 +254,8 @@ void FFmpegVideoDecoder::Initialize(
return;
}
+ FFmpegGlue::InitializeFFmpeg();
+
if (!ConfigureDecoder(config, low_delay)) {
bound_init_cb.Run(false);
return;
description: ffmpeg decoders before version 4.0 require explicit initialization
author: Michael Gilbert <mgilbert@debian.org>
origin: chromium 66 authors
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -80,6 +80,8 @@ void FFmpegAudioDecoder::Initialize(
return;
}
+ FFmpegGlue::InitializeFFmpeg();
+
if (!ConfigureDecoder(config)) {
av_sample_format_ = 0;
bound_init_cb.Run(false);
--- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -228,10 +228,13 @@ void ConvertCdmKeysInfo(const media::Cdm
}
}
+#include <libavformat/avformat.h>
+
void INITIALIZE_CDM_MODULE() {
DVLOG(1) << __func__;
#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
media::InitializeMediaLibrary();
+ av_register_all();
#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
g_is_cdm_module_initialized = true;
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -63,7 +63,13 @@ static int64_t AVIOSeekOperation(void* o
return new_offset;
}
+void FFmpegGlue::InitializeFFmpeg() {
+ av_register_all();
+}
+
FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
+ InitializeFFmpeg();
+
// Initialize an AVIOContext using our custom read and seek operations. Don't
// keep pointers to the buffer since FFmpeg may reallocate it on the fly. It
// will be cleaned up
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -59,6 +59,8 @@ class MEDIA_EXPORT FFmpegURLProtocol {
class MEDIA_EXPORT FFmpegGlue {
public:
+ static void InitializeFFmpeg();
+
// See file documentation for usage. |protocol| must outlive FFmpegGlue.
explicit FFmpegGlue(FFmpegURLProtocol* protocol);
~FFmpegGlue();
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -28,6 +28,7 @@
#include "media/base/video_util.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/ffmpeg/ffmpeg_decoding_loop.h"
+#include "media/filters/ffmpeg_glue.h"
namespace media {
@@ -110,6 +111,7 @@ static void ReleaseVideoBufferImpl(void*
// static
bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
+ FFmpegGlue::InitializeFFmpeg();
return avcodec_find_decoder(VideoCodecToCodecID(codec)) != nullptr;
}
@@ -253,6 +255,8 @@ void FFmpegVideoDecoder::Initialize(
return;
}
+ FFmpegGlue::InitializeFFmpeg();
+
if (!ConfigureDecoder(config, low_delay)) {
bound_init_cb.Run(false);
return;
description: disable build commands for embedded fontconfig
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/posix/BUILD.gn
+++ b/build/config/posix/BUILD.gn
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//buildtools/deps_revisions.gni")
import("//build/config/c++/c++.gni")
import("//build/config/clang/clang.gni")
import("//build/config/compiler/compiler.gni")
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -185,13 +185,6 @@ static_library("test_support") {
if (is_linux) {
public_deps += [ ":fontconfig_util_linux" ]
- data_deps = [
- "//third_party/test_fonts",
- ]
- if (current_toolchain == host_toolchain) {
- data_deps += [ ":do_generate_fontconfig_caches" ]
- data += [ "$root_out_dir/fontconfig_caches/" ]
- }
}
if (is_ios) {
@@ -338,7 +331,7 @@ if (is_linux) {
]
}
- if (current_toolchain == host_toolchain) {
+ if (false) {
executable("generate_fontconfig_caches") {
testonly = true
sources = [
--- a/content/shell/test_runner/BUILD.gn
+++ b/content/shell/test_runner/BUILD.gn
@@ -168,7 +168,7 @@ group("resources") {
if (is_mac) {
deps += [ ":test_runner_bundle_data" ]
data_deps += [ ":test_runner_bundle_data" ]
- } else {
+ } else if (false) {
deps += [ "//third_party/test_fonts" ]
data_deps += [ "//third_party/test_fonts" ]
}
This diff is collapsed.
description: use system jpeg library
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -682,7 +682,6 @@ group("gn_all") {
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/leveldatabase:leveldb_test_targets",
- "//third_party/libjpeg_turbo:simd",
"//third_party/opus:opus_compare",
"//third_party/opus:opus_demo",
"//third_party/opus:test_opus_api",
@@ -706,7 +705,6 @@ group("gn_all") {
if (enable_nacl) {
deps += [ "//native_client/src/trusted/platform_qualify:vcpuid" ]
}
- deps += [ "//third_party/libjpeg_turbo:simd_asm" ]
}
if (is_linux && current_toolchain == host_toolchain) {
deps += [ "//v8:v8_shell" ]
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
@@ -7,7 +7,7 @@
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/wtf/vector.h"
-#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
+#include <jpeglib.h> // for JPEG_MAX_DIMENSION
#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
#include "third_party/skia/include/core/SkStream.h"
#include "third_party/skia/include/encode/SkJpegEncoder.h"
description: libdrm in stretch doesn't explicitly define DRM_FORMAT_MOD_INVALID
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/gfx/native_pixmap_handle.cc
+++ b/ui/gfx/native_pixmap_handle.cc
@@ -11,7 +11,7 @@
namespace gfx {
-#if defined(OS_LINUX)
+#if 0
static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID,
"gfx::NativePixmapPlane::kNoModifier should be an alias for"
"DRM_FORMAT_MOD_INVALID");
description: system libxml2 2.9.4 does not yet provide XML_PARSE_NOXXE
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/libxml/chromium/libxml_utils.cc
+++ b/third_party/libxml/chromium/libxml_utils.cc
@@ -24,8 +24,7 @@ XmlReader::~XmlReader() {
bool XmlReader::Load(const std::string& input) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
// TODO(evanm): Verify it's OK to pass NULL for the URL and encoding.
// The libxml code allows for these, but it's unclear what effect is has.
reader_ = xmlReaderForMemory(input.data(), static_cast<int>(input.size()),
@@ -35,8 +34,7 @@ bool XmlReader::Load(const std::string&
bool XmlReader::LoadFile(const std::string& file_path) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
reader_ = xmlReaderForFile(file_path.c_str(), NULL, kParseOptions);
return reader_ != NULL;
}
...@@ -15,37 +15,37 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -15,37 +15,37 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/base/time/time.cc --- a/base/time/time.cc
+++ b/base/time/time.cc +++ b/base/time/time.cc
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
#include "base/logging.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
-#include "base/third_party/nspr/prtime.h" -#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h> +#include <nspr/prtime.h>
#include "base/time/time_override.h"
#include "build/build_config.h" #include "build/build_config.h"
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py --- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py
@@ -492,7 +492,6 @@ def write_gn_ninja(path, root_gen_dir, o @@ -612,7 +612,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/third_party/dmg_fp/dtoa_wrapper.cc', 'base/third_party/dmg_fp/dtoa_wrapper.cc',
'base/third_party/dmg_fp/g_fmt.cc', 'base/third_party/dmg_fp/g_fmt.cc',
'base/third_party/icu/icu_utf.cc', 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc', - 'base/third_party/nspr/prtime.cc',
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc', 'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequenced_task_runner_handle.cc', 'base/threading/scoped_blocking_call.cc',
@@ -601,7 +600,7 @@ def write_gn_ninja(path, root_gen_dir, o 'base/threading/sequence_local_storage_map.cc',
} @@ -764,7 +763,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
if is_linux: 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
- libs.extend(['-lrt', '-latomic']) ])
+ libs.extend(['-lrt', '-latomic', '-lnspr4']) - libs.extend(['-lrt', '-latomic'])
ldflags.extend(['-pthread']) + libs.extend(['-lrt', '-latomic', '-lnspr4'])
static_libraries['libevent']['include_dirs'].extend([
static_libraries['xdg_user_dirs'] = { os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
])
--- a/base/BUILD.gn --- a/base/BUILD.gn
+++ b/base/BUILD.gn +++ b/base/BUILD.gn
@@ -58,6 +58,9 @@ config("base_flags") { @@ -86,6 +86,9 @@ config("base_flags") {
"-Wno-char-subscripts", "-Wexit-time-destructors",
] ]
} }
+ ldflags = [ + ldflags = [
...@@ -54,12 +54,12 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -54,12 +54,12 @@ author: Michael Gilbert <mgilbert@debian.org>
} }
config("base_implementation") { config("base_implementation") {
@@ -861,8 +864,6 @@ component("base") { @@ -877,8 +880,6 @@ jumbo_component("base") {
"third_party/dmg_fp/g_fmt.cc", "third_party/dmg_fp/g_fmt.cc",