summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 21:39:00 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 21:39:00 +0000
commit62a51b19404605b769c04d2860362fea6fbdca4b (patch)
tree0630dc4f6b906e2b85a20f647222a8b66b1af64c
parentdd1406004c7b0d52e707d826f2ccbf5ae2798eff (diff)
downloadchromium_src-62a51b19404605b769c04d2860362fea6fbdca4b.zip
chromium_src-62a51b19404605b769c04d2860362fea6fbdca4b.tar.gz
chromium_src-62a51b19404605b769c04d2860362fea6fbdca4b.tar.bz2
Make cloud_print_unittests depend on allocator.gyp:allocator when necessary
This fixes the heapchecker+components release build. BUG=241938 TBR=gene@chromium.org Review URL: https://codereview.chromium.org/15380002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201367 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--cloud_print/cloud_print.gyp6
1 files changed, 6 insertions, 0 deletions
diff --git a/cloud_print/cloud_print.gyp b/cloud_print/cloud_print.gyp
index ccf81a5..b746f41 100644
--- a/cloud_print/cloud_print.gyp
+++ b/cloud_print/cloud_print.gyp
@@ -97,6 +97,12 @@
'virtual_driver/win/virtual_driver.gyp:gcp_portmon_lib',
],
}],
+ # See http://crbug.com/162998#c4 for why this is needed.
+ ['OS=="linux" and linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
],
'msvs_settings': {
'VCLinkerTool': {