diff options
| author | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:30:38 +0000 |
|---|---|---|
| committer | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:30:38 +0000 |
| commit | 6df3ebfbab4615970e363ad194ad279b5bdd1336 (patch) | |
| tree | 7ff1f4cec7b7f3a00323db2be47f088d1f334e45 /build | |
| parent | 366a883e1ad04b5cf8a7088644560ab86f5f1f0d (diff) | |
| download | chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.zip chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.tar.gz chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.tar.bz2 | |
Revert 64454 - 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
TBR=scottbyer@google.com
Review URL: http://codereview.chromium.org/4137013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4d5836e..b8a31eba 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -392,7 +392,7 @@ 'NACL_WIN64', ], }], - ['OS=="linux" and chromeos==0 and target_arch!="arm"', { + ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', { 'use_cups%': 1, }, { 'use_cups%': 0, |