summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorscottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 18:16:44 +0000
committerscottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 18:16:44 +0000
commit0dc2a814add97c39e5fcd99b31bfeae028fdead0 (patch)
tree2e7c869798e2a6eb7a82c2e712259c166ec384ca /build
parent0e92b5fa4d9837066b9c8ae6d36e9ec32174f3cf (diff)
downloadchromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.zip
chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.tar.gz
chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.tar.bz2
Revert 64441 - Mac cloud print proxy work.
Turn on use_cups for the Mac, add in the required library, and tweak the code to get it linking. There is still more work to do; this is just a gyp-oriented change to get things started. BUG=none TEST=All targets still build on all platforms. Review URL: http://codereview.chromium.org/4167006 TBR=scottbyer@chromium.org Review URL: http://codereview.chromium.org/4136011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index b8a31eba..4d5836e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -392,7 +392,7 @@
'NACL_WIN64',
],
}],
- ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
+ ['OS=="linux" and chromeos==0 and target_arch!="arm"', {
'use_cups%': 1,
}, {
'use_cups%': 0,