summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/all.gyp6
-rw-r--r--chrome/chrome.gyp6
-rw-r--r--chrome/chrome_browser.gypi6
-rw-r--r--chrome/chrome_browser_chromeos.gypi6
-rw-r--r--chrome/chrome_browser_ui.gypi6
-rw-r--r--chrome/chrome_common.gypi6
-rw-r--r--chrome/chrome_dll.gypi6
-rw-r--r--chrome/chrome_renderer.gypi6
-rw-r--r--chrome/chrome_tests.gypi12
-rw-r--r--cloud_print/service/service.gyp6
-rw-r--r--content/content_browser.gypi6
-rw-r--r--printing/printing.gyp10
-rw-r--r--webkit/glue/webkit_glue.gypi6
13 files changed, 65 insertions, 23 deletions
diff --git a/build/all.gyp b/build/all.gyp
index d427a10..b2dad99 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -251,7 +251,6 @@
'../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
- '../printing/printing.gyp:printing_unittests',
'../remoting/remoting.gyp:remoting_unittests',
'../sync/sync.gyp:sync_unit_tests',
'../third_party/WebKit/public/all.gyp:all_blink',
@@ -350,6 +349,11 @@
'../google_apis/gcm/gcm.gyp:gcm_unit_tests',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing_unittests',
+ ],
+ }],
],
}, # target_name: chromium_builder_tests
{
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 415d8b0..d6894f4 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -28,7 +28,6 @@
'conditions': [
['OS!="ios"', {
'chromium_browser_dependencies': [
- '../printing/printing.gyp:printing',
'../ppapi/ppapi_internal.gyp:ppapi_host',
],
'chromium_child_dependencies': [
@@ -42,6 +41,11 @@
'../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_resources',
],
}],
+ ['enable_printing!=0', {
+ 'chromium_browser_dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
['OS=="win"', {
'platform_locale_settings_grd':
'app/resources/locale_settings_win.grd',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b983e79..8738420 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2669,7 +2669,6 @@
'../components/components.gyp:navigation_interception',
'../media/media.gyp:media',
'../net/net.gyp:net_with_v8',
- '../printing/printing.gyp:printing',
# TODO(tonyg): Remove this dependency (crbug.com/280157).
'../testing/perf/perf_test.gyp:*',
'../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
@@ -2723,6 +2722,11 @@
'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']},
},
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
['OS=="win" or OS=="mac"', {
'sources': [
'browser/media_galleries/fileapi/iapps_data_provider.cc',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 95f947f..9aa8320 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -64,7 +64,6 @@
'../media/media.gyp:media',
'../net/net.gyp:net',
'../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
- '../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync',
'../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
@@ -966,6 +965,11 @@
['include', '^browser/chromeos/status/memory_menu_button.h'],
],
}],
+ ['enable_printing != 0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
],
},
{
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 2c4d1c4..a6258bb 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2552,7 +2552,6 @@
'../device/bluetooth/bluetooth.gyp:device_bluetooth',
'../media/media.gyp:media',
'../net/net.gyp:net_with_v8',
- '../printing/printing.gyp:printing',
'../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
'../third_party/expat/expat.gyp:expat',
'../third_party/hunspell/hunspell.gyp:hunspell',
@@ -2590,6 +2589,11 @@
['include', '^browser/ui/profile_error_dialog\\.cc$'],
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
['OS!="ios" and chrome_multiple_dll!=1', {
'dependencies': [
'../webkit/glue/webkit_glue.gyp:glue',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index d2bc454..a29a0f3 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -454,7 +454,6 @@
'<(DEPTH)/components/components.gyp:autofill_core_common',
'<(DEPTH)/components/nacl_common.gyp:nacl_common',
'<(DEPTH)/ipc/ipc.gyp:ipc',
- '<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
'<(DEPTH)/third_party/re2/re2.gyp:re2',
'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
@@ -491,6 +490,11 @@
'<(DEPTH)/breakpad/src',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '<(DEPTH)/printing/printing.gyp:printing',
+ ],
+ }],
['OS!="ios" and chrome_multiple_dll!=1', {
'dependencies': [
'<(DEPTH)/webkit/glue/webkit_glue.gyp:glue',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 6226c32..84a22fd 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -110,7 +110,6 @@
'chrome_version_resources',
'../chrome/chrome_resources.gyp:chrome_unscaled_resources',
'../crypto/crypto.gyp:crypto',
- '../printing/printing.gyp:printing',
'../net/net.gyp:net_resources',
'../ui/views/views.gyp:views',
'../webkit/webkit_resources.gyp:webkit_resources',
@@ -214,6 +213,11 @@
'<(allocator_target)',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
]
}],
['chrome_multiple_dll==1', {
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index cc7cbcd..9e9837c 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -23,7 +23,6 @@
'../media/cast/cast.gyp:cast_config',
'../media/cast/cast_sender.gyp:cast_sender',
'../net/net.gyp:net',
- '../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../third_party/WebKit/public/blink.gyp:blink',
'../third_party/hunspell/hunspell.gyp:hunspell',
@@ -476,6 +475,11 @@
'<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
],
},
],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 56406a2e..530ab9b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2314,7 +2314,6 @@
'test_support_chrome',
'test_support_common',
'../net/net.gyp:net',
- '../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync',
'../sync/sync.gyp:test_support_sync_testserver',
@@ -2482,6 +2481,11 @@
'../ui/views/views.gyp:views',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
],
},
{
@@ -2951,7 +2955,6 @@
# 'browser_tests',
'../ipc/ipc.gyp:ipc_tests',
'../net/net.gyp:net_unittests',
- '../printing/printing.gyp:printing_unittests',
'../remoting/remoting.gyp:remoting_unittests',
'../sql/sql.gyp:sql_unittests',
'../content/content_shell_and_tests.gyp:content_unittests',
@@ -2995,6 +2998,11 @@
'dependencies': [
# Placeholder; empty for now.
]}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing_unittests',
+ ],
+ }],
], # 'conditions'
'actions': [
{
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 1bdc552..2e07037 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -57,7 +57,6 @@
'<(DEPTH)/google_apis/google_apis.gyp:google_apis',
'<(DEPTH)/ipc/ipc.gyp:ipc',
'<(DEPTH)/net/net.gyp:net',
- '<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/url/url.gyp:url_lib',
'service_resources',
],
@@ -69,6 +68,11 @@
'<(DEPTH)/chrome/common_constants.gyp:common_constants',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '<(DEPTH)/printing/printing.gyp:printing',
+ ],
+ }],
],
'sources': [
'<(DEPTH)/content/public/common/content_switches.h',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 2dc3acf..60f268d 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1270,7 +1270,6 @@
'browser/devtools/devtools_resources.gyp:devtools_resources',
'../cc/cc.gyp:cc',
'../net/net.gyp:http_server',
- '../printing/printing.gyp:printing',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../ui/surface/surface.gyp:surface',
'../webkit/common/webkit_common.gyp:webkit_common',
@@ -1280,6 +1279,11 @@
'../webkit/webkit_resources.gyp:webkit_strings',
],
}],
+ ['enable_printing!=0', {
+ 'dependencies': [
+ '../printing/printing.gyp:printing',
+ ],
+ }],
['OS!="ios" and chrome_multiple_dll!=1', {
'dependencies': [
'../third_party/WebKit/public/blink.gyp:blink',
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 9e2c081..9d1ad98 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -94,11 +94,6 @@
],
},
'conditions': [
- ['enable_printing==0', {
- 'sources/': [
- ['exclude', '.'],
- ],
- }],
['use_aura==1', {
'dependencies': [
'<(DEPTH)/ui/aura/aura.gyp:aura',
@@ -261,11 +256,6 @@
'units_unittest.cc',
],
'conditions': [
- ['enable_printing==0', {
- 'sources/': [
- ['exclude', '.'],
- ],
- }],
['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_gtk_unittest\\.cc$']]}],
['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]}],
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',
+ ],
+ }],
],
},
],
generated by cgit v1.1 at 2025-02-07 02:38:20 +0000