diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-08-18 18:18:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-19 10:16:15 +0200 |
| commit | 065fa1ef2fbbec21c03f00eeaa9cd70f3956890c (patch) | |
| tree | 7d1af1cbbf61a05e7af904eef90a151989950eac | |
| parent | afd4c43bcef467da03d89d5468742a1dcbfa04fa (diff) | |
Update the gyp variable used to disable tcmalloc
This changed with chrome 37. We only need to define it unconditionally
in gyp_qtwebengine as tcmalloc is never an option for us.
Change-Id: I8b21eb1114582c1d9a8aa61c5f15fc8469721395
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | src/core/config/embedded_android.pri | 2 | ||||
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/config/embedded_android.pri b/src/core/config/embedded_android.pri index 1a537e8bf..6ffa1c077 100644 --- a/src/core/config/embedded_android.pri +++ b/src/core/config/embedded_android.pri @@ -8,7 +8,6 @@ GYP_ARGS += "-D qt_os=\"embedded_android\" -D android_src=\"$${TOOLCHAIN_SYSROOT GYP_CONFIG += \ OS=android_no_sdk \ - android_use_tcmalloc=0 \ android_webview_build=0 \ build_ffmpegsumo=0 \ configuration_policy=0 \ @@ -34,7 +33,6 @@ GYP_CONFIG += \ icu_use_data_file_flag=0 \ input_speech=0 \ java_bridge=0 \ - linux_use_tcmalloc=0 \ media_use_ffmpeg=0 \ media_use_libvpx=0 \ native_discardable_memory=1 \ diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 3cdacd184..3c7461993 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -106,7 +106,7 @@ if __name__ == '__main__': # We always have to disable tcmalloc. # Allocating with tcmalloc in chromium code and freeing without # tcmalloc outside of chromium code would cause erratic behavior. - args.extend(['-D', 'linux_use_tcmalloc=0']) + args.extend(['-D', 'use_allocator=none']) # On Mac we want to build in x64 mode. And we want to use libc++. if sys.platform in ('darwin',) and not 'GYP_CROSSCOMPILE' in os.environ: |