| Index: components/autofill.gypi
|
| diff --git a/components/autofill.gypi b/components/autofill.gypi
|
| index 255288adeb97679fade30b74c635a9cfb365b1fc..d634b5b4cf4b0110d2fdc38ef7026206d7a63127 100644
|
| --- a/components/autofill.gypi
|
| +++ b/components/autofill.gypi
|
| @@ -106,15 +106,6 @@
|
| '../ui/ui.gyp:ui',
|
| '../url/url.gyp:url_lib',
|
| ],
|
| - # TODO(blundell): Eliminate the need for this conditional dependence.
|
| - # crbug.com/328150
|
| - 'conditions': [
|
| - ['OS != "ios"', {
|
| - 'dependencies': [
|
| - '../webkit/webkit_resources.gyp:webkit_resources',
|
| - ],
|
| - }],
|
| - ],
|
| 'sources': [
|
| 'autofill/core/browser/address.cc',
|
| 'autofill/core/browser/address.h',
|
| @@ -197,6 +188,8 @@
|
| 'autofill/core/browser/webdata/autofill_change.h',
|
| 'autofill/core/browser/webdata/autofill_entry.cc',
|
| 'autofill/core/browser/webdata/autofill_entry.h',
|
| + 'autofill/core/browser/webdata/autofill_profile_syncable_service.cc',
|
| + 'autofill/core/browser/webdata/autofill_profile_syncable_service.h',
|
| 'autofill/core/browser/webdata/autofill_table.cc',
|
| 'autofill/core/browser/webdata/autofill_table.h',
|
| 'autofill/core/browser/webdata/autofill_webdata.h',
|
| @@ -210,6 +203,43 @@
|
| # This file is generated by the autofill_regexes action.
|
| '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
|
| ],
|
| + 'variables': {
|
| + 'conditions': [
|
| + ['android_webview_build == 1', {
|
| + # Android WebView doesn't support sync.
|
| + 'autofill_enable_sync%': 0,
|
| + }, {
|
| + 'autofill_enable_sync%': 1,
|
| + }],
|
| + ],
|
| + },
|
| + 'conditions': [
|
| + # TODO(blundell): Eliminate the need for this conditional dependence.
|
| + # crbug.com/328150
|
| + ['OS != "ios"', {
|
| + 'dependencies': [
|
| + '../webkit/webkit_resources.gyp:webkit_resources',
|
| + ],
|
| + }],
|
| + ['autofill_enable_sync == 1', {
|
| + 'defines': [
|
| + 'AUTOFILL_ENABLE_SYNC',
|
| + ],
|
| + 'dependencies': [
|
| + '../sync/sync.gyp:sync',
|
| + ],
|
| + 'direct_dependent_settings': {
|
| + 'defines': [
|
| + 'AUTOFILL_ENABLE_SYNC',
|
| + ],
|
| + },
|
| + }, { # 'autofill_enable_sync == 0'
|
| + 'sources!': [
|
| + 'autofill/core/browser/webdata/autofill_profile_syncable_service.cc',
|
| + 'autofill/core/browser/webdata/autofill_profile_syncable_service.h',
|
| + ],
|
| + }],
|
| + ],
|
|
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [4267, ],
|
|
|