From 065fa1ef2fbbec21c03f00eeaa9cd70f3956890c Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Mon, 18 Aug 2014 18:18:52 +0200 Subject: 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 --- src/core/config/embedded_android.pri | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/core/config') 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 \ -- cgit v1.2.3