| Index: components/components.gyp
|
| diff --git a/components/components.gyp b/components/components.gyp
|
| index 9871bb1fd62e6775a166475726749f2b3d6ab1d0..ed909152e1c4dd588709bf723afd3558bf86835a 100644
|
| --- a/components/components.gyp
|
| +++ b/components/components.gyp
|
| @@ -22,15 +22,18 @@
|
| 'crx_file.gypi',
|
| 'data_reduction_proxy.gypi',
|
| 'device_event_log.gypi',
|
| - 'network_hints.gypi',
|
| 'dom_distiller.gypi',
|
| 'domain_reliability.gypi',
|
| 'enhanced_bookmarks.gypi',
|
| 'error_page.gypi',
|
| + 'favicon.gypi',
|
| 'favicon_base.gypi',
|
| + 'gcm_driver.gypi',
|
| 'google.gypi',
|
| 'handoff.gypi',
|
| + 'history.gypi',
|
| 'infobars.gypi',
|
| + 'invalidation.gypi',
|
| 'json_schema.gypi',
|
| 'keyed_service.gypi',
|
| 'language_usage_metrics.gypi',
|
| @@ -38,7 +41,9 @@
|
| 'login.gypi',
|
| 'metrics.gypi',
|
| 'navigation_metrics.gypi',
|
| + 'network_hints.gypi',
|
| 'network_time.gypi',
|
| + 'omnibox.gypi',
|
| 'onc.gypi',
|
| 'os_crypt.gypi',
|
| 'ownership.gypi',
|
| @@ -49,12 +54,15 @@
|
| 'pref_registry.gypi',
|
| 'query_parser.gypi',
|
| 'rappor.gypi',
|
| + 'renderer_context_menu.gypi',
|
| 'search.gypi',
|
| + 'search_engines.gypi',
|
| 'search_provider_logos.gypi',
|
| 'sessions.gypi',
|
| 'signin.gypi',
|
| 'startup_metric_utils.gypi',
|
| 'suggestions.gypi',
|
| + 'sync_driver.gypi',
|
| 'translate.gypi',
|
| 'ui_zoom.gypi',
|
| 'update_client.gypi',
|
| @@ -65,6 +73,7 @@
|
| 'wallpaper.gypi',
|
| 'web_resource.gypi',
|
| 'webdata.gypi',
|
| + 'webdata_services.gypi',
|
| ],
|
| 'conditions': [
|
| ['OS != "ios"', {
|
| @@ -124,21 +133,6 @@
|
| 'constrained_window.gypi',
|
| ],
|
| }],
|
| - ['android_webview_build == 0', {
|
| - # Android WebView fails to build if a dependency on these targets is
|
| - # introduced.
|
| - 'includes': [
|
| - 'favicon.gypi',
|
| - 'gcm_driver.gypi',
|
| - 'history.gypi',
|
| - 'omnibox.gypi',
|
| - 'renderer_context_menu.gypi',
|
| - 'search_engines.gypi',
|
| - 'sync_driver.gypi',
|
| - 'invalidation.gypi',
|
| - 'webdata_services.gypi',
|
| - ],
|
| - }],
|
| ['enable_basic_printing==1 or enable_print_preview==1', {
|
| 'includes': [
|
| 'printing.gypi',
|
|
|