summaryrefslogtreecommitdiff
path: root/chromium/third_party/cld
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/third_party/cld
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/cld')
-rw-r--r--chromium/third_party/cld/README.chromium1
-rw-r--r--chromium/third_party/cld/base/build_config.h5
2 files changed, 1 insertions, 5 deletions
diff --git a/chromium/third_party/cld/README.chromium b/chromium/third_party/cld/README.chromium
index 865ba588819..4799d10072d 100644
--- a/chromium/third_party/cld/README.chromium
+++ b/chromium/third_party/cld/README.chromium
@@ -13,3 +13,4 @@ available from the Chromium tree, and not well-documented otherwise.
Local Modifications:
* Add support for arm64 architecture
+ * Remove dead USE_TCMALLOC #define.
diff --git a/chromium/third_party/cld/base/build_config.h b/chromium/third_party/cld/base/build_config.h
index ef6d40b9667..6fbf5c172e6 100644
--- a/chromium/third_party/cld/base/build_config.h
+++ b/chromium/third_party/cld/base/build_config.h
@@ -58,11 +58,6 @@
#define USE_BASE_DATA_PACK 1
#endif
-// Use tcmalloc
-#if defined(OS_WIN) && ! defined(NO_TCMALLOC)
-#define USE_TCMALLOC 1
-#endif
-
// Compiler detection.
#if defined(__GNUC__)
#define COMPILER_GCC 1