diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-28 14:23:16 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-03 11:30:05 +0200 |
| commit | 431695b48926d897018cf5d5a6729428bf2d9250 (patch) | |
| tree | 2a9ddf0eaae354b2be50e11b5fa3878e1e9f018b | |
| parent | ca469a0ede416420e3f78ba7cb065394b54ecb21 (diff) | |
| download | qtwebengine-chromium-431695b48926d897018cf5d5a6729428bf2d9250.tar.gz | |
Fix linking issue on some Linux builds
The memory instrumentation implemenatation for Linux requires static
linking, so replace it with the stub implemenation.
Change-Id: I7f3c027b27cc309c1acef26a9d5952f1c1ee02e4
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn index 1a655864a1c..2bdb9526ca5 100644 --- a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn +++ b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn @@ -30,6 +30,12 @@ component("memory_instrumentation") { if (is_fuchsia) { sources += [ "os_metrics_fuchsia.cc" ] } + if (is_linux && is_shared) { + # The linux implementation requires a static build, + # and the fuchsia implementation is just a stub. + sources -= [ "os_metrics_linux.cc" ] + sources += [ "os_metrics_fuchsia.cc" ] + } defines = [ "IS_RESOURCE_COORDINATOR_PUBLIC_MEMORY_INSTRUMENTATION_IMPL" ] |