summaryrefslogtreecommitdiffstats
path: root/build/temp_gyp
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-05 15:14:31 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-05 15:14:31 +0000
commit06e5ecfea75f9f73a466b94ddfdde19b0f438293 (patch)
treecde9239f6079ede9dfc50896b32357148ed57512 /build/temp_gyp
parent9d3d395e632298bee70084094f2f1ee30aa5d933 (diff)
downloadchromium_src-06e5ecfea75f9f73a466b94ddfdde19b0f438293.zip
chromium_src-06e5ecfea75f9f73a466b94ddfdde19b0f438293.tar.gz
chromium_src-06e5ecfea75f9f73a466b94ddfdde19b0f438293.tar.bz2
Add iOS support to googleurl.gyp
Opts out of tcmalloc, as on Mac. BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/10701101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/temp_gyp')
-rw-r--r--build/temp_gyp/googleurl.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index 66665bb..1bd9a7a 100644
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/temp_gyp/googleurl.gyp
@@ -90,7 +90,7 @@
'FULL_FILESYSTEM_URL_SUPPORT=1',
],
'conditions': [
- ['os_posix==1 and OS!="mac"', {
+ ['os_posix==1 and OS!="mac" and OS!="ios"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [