summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 09:02:36 +0000
committerspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 09:02:36 +0000
commitf757c1ae7b770f3d7ba95e791f6e69e6f6eb98e1 (patch)
treeb1ca75753695d444f2bf05e15d6492854f1b2314 /webkit
parent070bb456483ca81ab4149729714530d0217047d0 (diff)
downloadchromium_src-f757c1ae7b770f3d7ba95e791f6e69e6f6eb98e1.zip
chromium_src-f757c1ae7b770f3d7ba95e791f6e69e6f6eb98e1.tar.gz
chromium_src-f757c1ae7b770f3d7ba95e791f6e69e6f6eb98e1.tar.bz2
Allow printing component to be removed completely
Using enable_printing=0 removes all of the source files of the printing component, but has no effect on its dependencies. It is wrong to empty out the target inside the target. If printing is disabled, then the dependency on printing.gyp is not needed and can be removed. This target was causing libgcrypt to be linked even when printing was disabled. That problem goes away with this change. Review URL: https://codereview.chromium.org/62793002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_glue.gypi6
1 files changed, 5 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index b01d327..868d22f 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -29,7 +29,6 @@
'<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
'<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
'<(DEPTH)/net/net.gyp:net',
- '<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
@@ -99,6 +98,11 @@
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '<(DEPTH)/printing/printing.gyp:printing',
+ ],
+ }],
],
},
],