diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-16 16:30:02 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-10 14:40:01 +0000 |
| commit | a1c97eba03700fda4b0623a19497655b81f110ca (patch) | |
| tree | 97290908e21dc819c990d76188bcaf24b8dec416 | |
| parent | d1326f592e2c03c6ebf8ee8a404fddac02314e69 (diff) | |
| download | qtwebengine-chromium-a1c97eba03700fda4b0623a19497655b81f110ca.tar.gz | |
Do not include most components
Change-Id: I78159b07de2ec05891bbd8b9c3e2d482b9e07eda
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| -rw-r--r-- | chromium/components/components.gyp | 19 | ||||
| -rw-r--r-- | chromium/components/error_page.gypi | 1 | ||||
| -rw-r--r-- | chromium/components/resources/components_resources.grd | 8 |
3 files changed, 23 insertions, 5 deletions
diff --git a/chromium/components/components.gyp b/chromium/components/components.gyp index fd1bf307512..33b3e9fb61e 100644 --- a/chromium/components/components.gyp +++ b/chromium/components/components.gyp @@ -9,6 +9,23 @@ # _mac.h or _mac.cc are only compiled on MacOSX). 'chromium_code': 1, }, + 'conditions': [ + ['use_qt==1', { + 'includes': [ + 'cdm.gypi', + 'device_event_log.gypi', + 'devtools_discovery.gypi', + 'devtools_http_handler.gypi', + 'error_page.gypi', + 'keyed_service.gypi', + 'pref_registry.gypi', + 'printing.gypi', + 'user_prefs.gypi', + 'visitedlink.gypi', + 'web_cache.gypi', + 'webusb.gypi', + ], + }, { 'includes': [ 'about_handler.gypi', 'auto_login_parser.gypi', @@ -209,4 +226,6 @@ ], }], ], + }], +], } diff --git a/chromium/components/error_page.gypi b/chromium/components/error_page.gypi index de8bb3be17a..8eba743d3bb 100644 --- a/chromium/components/error_page.gypi +++ b/chromium/components/error_page.gypi @@ -15,7 +15,6 @@ '../url/url.gyp:url_lib', '../ui/base/ui_base.gyp:ui_base', 'components_strings.gyp:components_strings', - 'offline_pages', 'url_formatter/url_formatter.gyp:url_formatter', ], 'include_dirs': [ diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd index ba428ecb3ab..92193353499 100644 --- a/chromium/components/resources/components_resources.grd +++ b/chromium/components/resources/components_resources.grd @@ -8,21 +8,21 @@ </outputs> <release seq="1"> <includes> - <part file="about_ui_resources.grdp" /> +<!-- <part file="about_ui_resources.grdp" /> <part file="crash_resources.grdp" /> <part file="dom_distiller_resources.grdp" /> <part file="flags_ui_resources.grdp" /> <part file="gcm_driver_resources.grdp" /> - <part file="net_log_resources.grdp" /> + <part file="net_log_resources.grdp" />--> <part file="neterror_resources.grdp" /> <part file="printing_resources.grdp" /> - <part file="proximity_auth_resources.grdp" /> +<!-- <part file="proximity_auth_resources.grdp" /> <part file="security_interstitials_resources.grdp" /> <part file="signin_resources.grdp" /> <part file="supervised_user_error_page_resources.grdp" /> <part file="sync_driver_resources.grdp" /> <part file="translate_resources.grdp" /> - <part file="version_ui_resources.grdp" /> + <part file="version_ui_resources.grdp" />--> </includes> </release> </grit> |