| Index: components/autofill.gypi
|
| diff --git a/components/autofill.gypi b/components/autofill.gypi
|
| index 4268928331fd85433c9c4506a62c69a0e4d9f422..b07d3de8a750f529f6c4d1df39b4ceeab898f725 100644
|
| --- a/components/autofill.gypi
|
| +++ b/components/autofill.gypi
|
| @@ -38,10 +38,73 @@
|
| ],
|
| 'conditions': [
|
| ['OS != "ios"', {
|
| +
|
| + 'conditions': [
|
| + ['component=="static_library"', {
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'autofill_common',
|
| + 'type': 'none',
|
| + 'dependencies': ['autofill_common_static'],
|
| + },
|
| + {
|
| + 'target_name': 'autofill_browser',
|
| + 'type': 'none',
|
| + 'dependencies': ['autofill_browser_static'],
|
| + },
|
| + {
|
| + 'target_name': 'autofill_renderer',
|
| + 'type': 'none',
|
| + 'dependencies': ['autofill_renderer_static'],
|
| + },
|
| + ],
|
| + }, { # component != static_library
|
| + 'targets': [
|
| + {
|
| + # In component mode, we build all of autofill as a single DLL.
|
| + 'target_name': 'autofill', # Autofill code use only.
|
| + 'type': 'shared_library',
|
| + 'dependencies': [
|
| + 'autofill_common_static',
|
| + 'autofill_browser_static',
|
| + 'autofill_renderer_static',
|
| + ],
|
| +'msvs_settings': {
|
| + 'VCLinkerTool': {
|
| + 'conditions': [
|
| + ['incremental_chrome_dll==1', {
|
| + 'UseLibraryDependencyInputs': "true",
|
| + }],
|
| + ],
|
| + },
|
| +},
|
| + },
|
| + {
|
| + 'target_name': 'autofill_common',
|
| + 'type': 'none',
|
| + 'dependencies': ['autofill'],
|
| + },
|
| + {
|
| + 'target_name': 'autofill_browser',
|
| + 'type': 'none',
|
| + 'dependencies': ['autofill'],
|
| + },
|
| + {
|
| + 'target_name': 'autofill_renderer',
|
| + 'type': 'none',
|
| + 'dependencies': ['autofill'],
|
| + },
|
| + ],
|
| + }],
|
| + ],
|
| +
|
| 'targets': [
|
| {
|
| - 'target_name': 'autofill_common',
|
| + 'target_name': 'autofill_common_static', # Autofill code use only.
|
| 'type': 'static_library',
|
| + 'defines': [
|
| + 'AUTOFILL_COMPONENT_IMPLEMENTATION',
|
| + ],
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| '../build/temp_gyp/googleurl.gyp:googleurl',
|
| @@ -72,6 +135,7 @@
|
| 'autofill/common/autocheckout_status.h',
|
| 'autofill/common/autofill_constants.cc',
|
| 'autofill/common/autofill_constants.h',
|
| + 'autofill/common/autofill_export.h',
|
| 'autofill/common/autofill_messages.h',
|
| 'autofill/common/autofill_message_generator.cc',
|
| 'autofill/common/autofill_message_generator.h',
|
| @@ -97,30 +161,38 @@
|
| },
|
|
|
| {
|
| - 'target_name': 'autofill_browser',
|
| + 'target_name': 'autofill_browser_static', # Autofill code use only.
|
| 'type': 'static_library',
|
| + 'defines': [
|
| + 'AUTOFILL_COMPONENT_IMPLEMENTATION',
|
| + ],
|
| 'include_dirs': [
|
| '..',
|
| ],
|
| 'dependencies': [
|
| - 'autofill_common',
|
| + 'autofill_common_static',
|
| 'autofill_regexes',
|
| 'autofill_risk_proto',
|
| 'encryptor',
|
| + 'user_prefs',
|
| 'webdata_common',
|
| '../base/base.gyp:base',
|
| '../base/base.gyp:base_i18n',
|
| + '../base/base.gyp:base_prefs',
|
| '../build/temp_gyp/googleurl.gyp:googleurl',
|
| '../content/content.gyp:content_browser',
|
| '../content/content.gyp:content_common',
|
| + '../google_apis/google_apis.gyp:google_apis',
|
| '../ipc/ipc.gyp:ipc',
|
| '../skia/skia.gyp:skia',
|
| '../sql/sql.gyp:sql',
|
| + '../sync/sync.gyp:sync',
|
| '../third_party/icu/icu.gyp:icui18n',
|
| '../third_party/icu/icu.gyp:icuuc',
|
| '../third_party/libjingle/libjingle.gyp:libjingle',
|
| '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
|
| '../ui/ui.gyp:ui',
|
| + '../webkit/support/webkit_support.gyp:glue',
|
| '../webkit/support/webkit_support.gyp:webkit_resources',
|
|
|
| # For grip/generated_resources.h and grit/chromium_strings.h
|
| @@ -254,13 +326,16 @@
|
| },
|
|
|
| {
|
| - 'target_name': 'autofill_renderer',
|
| + 'target_name': 'autofill_renderer_static', # Autofill code use only.
|
| 'type': 'static_library',
|
| + 'defines': [
|
| + 'AUTOFILL_COMPONENT_IMPLEMENTATION',
|
| + ],
|
| 'include_dirs': [
|
| '..',
|
| ],
|
| 'dependencies': [
|
| - 'autofill_common',
|
| + 'autofill_common_static',
|
| '../base/base.gyp:base',
|
| '../content/content.gyp:content_renderer',
|
| '../content/content.gyp:content_common',
|
|
|