Index: components/autofill.gypi |
diff --git a/components/autofill.gypi b/components/autofill.gypi |
index 3feb6d6e3046f80b9368079d382302dd67ccbc81..a954136ff2e63f156ba05020c14f760157fc02a0 100644 |
--- a/components/autofill.gypi |
+++ b/components/autofill.gypi |
@@ -86,15 +86,10 @@ |
'..', |
], |
'dependencies': [ |
- 'autofill_core_common', |
- 'autofill_regexes', |
- 'component_strings.gyp:component_strings', |
- 'encryptor', |
- 'user_prefs', |
- 'webdata_common', |
'../base/base.gyp:base', |
'../base/base.gyp:base_i18n', |
'../base/base.gyp:base_prefs', |
+ '../chrome/chrome_resources.gyp:packed_extra_resources', |
blundell
2014/02/27 16:18:47
Could you add a bug for eliminating this dependenc
tfarina
2014/02/27 16:56:59
Filed the bug in crbug.com/347585. I will update t
tfarina
2014/02/27 17:01:38
Actually, I'm gonna give this another shot and see
|
'../google_apis/google_apis.gyp:google_apis', |
'../skia/skia.gyp:skia', |
'../sql/sql.gyp:sql', |
@@ -105,6 +100,13 @@ |
'../ui/gfx/gfx.gyp:gfx', |
'../ui/ui.gyp:ui', |
'../url/url.gyp:url_lib', |
+ 'autofill_core_common', |
+ 'autofill_regexes', |
+ 'component_resources.gyp:component_resources', |
+ 'component_strings.gyp:component_strings', |
+ 'encryptor', |
+ 'user_prefs', |
+ 'webdata_common', |
], |
'sources': [ |
'autofill/core/browser/address.cc', |
@@ -214,13 +216,6 @@ |
], |
}, |
'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', |
@@ -331,17 +326,10 @@ |
'..', |
], |
'dependencies': [ |
- 'autofill_content_common', |
- 'autofill_content_risk_proto', |
- 'autofill_core_browser', |
- 'autofill_core_common', |
- 'autofill_regexes', |
- 'encryptor', |
- 'user_prefs', |
- 'webdata_common', |
'../base/base.gyp:base', |
'../base/base.gyp:base_i18n', |
'../base/base.gyp:base_prefs', |
+ '../chrome/chrome_resources.gyp:packed_extra_resources', |
'../content/content.gyp:content_browser', |
'../content/content.gyp:content_common', |
'../google_apis/google_apis.gyp:google_apis', |
@@ -356,9 +344,16 @@ |
'../ui/gfx/gfx.gyp:gfx_geometry', |
'../ui/ui.gyp:ui', |
'../url/url.gyp:url_lib', |
- '../webkit/webkit_resources.gyp:webkit_resources', |
- |
+ 'autofill_content_common', |
+ 'autofill_content_risk_proto', |
+ 'autofill_core_browser', |
+ 'autofill_core_common', |
+ 'autofill_regexes', |
+ 'component_resources.gyp:component_resources', |
'component_strings.gyp:component_strings', |
+ 'encryptor', |
+ 'user_prefs', |
+ 'webdata_common', |
], |
'sources': [ |
'autofill/content/browser/autofill_driver_impl.cc', |