From 592b67d6fc1bac06a9da2a51b3d32ff718dced37 Mon Sep 17 00:00:00 2001 From: Anthony Tseng Date: Mon, 8 Aug 2016 09:14:37 +0800 Subject: [PATCH] Add Autofill support fix https://github.com/brave/browser-laptop/issues/860 auditor: @bridiver, @bbondy --- chromiumcontent/extensions.gyp | 16 +++++++++++++ script/lib/extensions.py | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/chromiumcontent/extensions.gyp b/chromiumcontent/extensions.gyp index 435087b84..e7eacc368 100644 --- a/chromiumcontent/extensions.gyp +++ b/chromiumcontent/extensions.gyp @@ -7,19 +7,32 @@ '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', '<(DEPTH)/services/shell/shell_public.gyp:shell_public', + '<(DEPTH)/components/components.gyp:autofill_core_common', + '<(DEPTH)/components/components.gyp:autofill_core_browser', + '<(DEPTH)/components/components.gyp:autofill_server_proto', + '<(DEPTH)/components/components.gyp:autofill_content_mojo_bindings_mojom', + '<(DEPTH)/components/components.gyp:autofill_content_mojo_bindings', + '<(DEPTH)/components/components.gyp:autofill_content_common', + '<(DEPTH)/components/components.gyp:autofill_content_risk_proto', + '<(DEPTH)/components/components.gyp:autofill_content_browser', + '<(DEPTH)/components/components.gyp:autofill_content_renderer', '<(DEPTH)/components/components.gyp:browsing_data', '<(DEPTH)/components/components.gyp:content_settings_core_common', '<(DEPTH)/components/components.gyp:crx_file', + '<(DEPTH)/components/components.gyp:data_use_measurement_core', '<(DEPTH)/components/components.gyp:guest_view_browser', '<(DEPTH)/components/components.gyp:guest_view_common', '<(DEPTH)/components/components.gyp:guest_view_renderer', '<(DEPTH)/components/components.gyp:json_schema', '<(DEPTH)/components/components.gyp:keyed_service_content', '<(DEPTH)/components/components.gyp:keyed_service_core', + '<(DEPTH)/components/components.gyp:os_crypt', '<(DEPTH)/components/components.gyp:policy', '<(DEPTH)/components/components.gyp:policy_component_browser', '<(DEPTH)/components/components.gyp:policy_component_common', '<(DEPTH)/components/components.gyp:pref_registry', + '<(DEPTH)/components/components.gyp:signin_core_browser', + '<(DEPTH)/components/components.gyp:signin_core_common', '<(DEPTH)/components/components.gyp:syncable_prefs', '<(DEPTH)/components/components.gyp:ui_zoom', '<(DEPTH)/components/components.gyp:url_matcher', @@ -37,6 +50,9 @@ '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources', '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', + '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util', + '<(DEPTH)/third_party/libphonenumber/libphonenumber.gyp:libphonenumber', + '<(DEPTH)/third_party/libphonenumber/libphonenumber.gyp:libphonenumber_without_metadata', ], 'conditions': [ ['OS=="win" or OS=="mac"', { diff --git a/script/lib/extensions.py b/script/lib/extensions.py index 1f9767f8d..82388e835 100644 --- a/script/lib/extensions.py +++ b/script/lib/extensions.py @@ -17,13 +17,23 @@ os.path.join('gen', 'chrome', 'extensions_api_resources.pak'), ], 'darwin': [ + 'libaddressinput_util.a', 'libapi_gen_util.a', + 'libautofill_content_browser.a', + 'libautofill_content_common.a', + 'libautofill_content_mojo_bindings.a', + 'libautofill_content_renderer.a', + 'libautofill_core_browser.a', + 'libautofill_core_common.a', + 'libautofill_server_proto.a', + 'libos_crypt.a', 'libbrowsing_data.a', 'libchrome_api.a', 'libchrome_zlib.a', 'libcld2_static.a', 'libcontent_settings_core_common.a', 'libcrx_file.a', + 'libdata_use_measurement_core.a', 'libdevice_usb.a', 'libextensions_api.a', 'libextensions_api_registration.a', @@ -32,6 +42,7 @@ 'libextensions_common_constants.a', 'libextensions_renderer.a', 'libextensions_utility.a', + 'libgoogle_apis.a', 'libguest_view_browser.a', 'libguest_view_common.a', 'libguest_view_renderer.a', @@ -39,9 +50,13 @@ 'libmojo_cpp_system.a', 'libmojo_cpp_bindings.a', 'libmojo_js_bindings.a', + 'libphonenumber.a', + 'libphonenumber_without_metadata.a', 'libpref_registry.a', 'libre2.a', 'libsnappy.a', + 'libsignin_core_browser.a', + 'libsignin_core_common.a', 'libsyncable_prefs.a', 'libui_zoom.a', 'libvariations.a', @@ -52,13 +67,23 @@ 'libzlib_x86_simd.a', ], 'linux': [ + 'libaddressinput_util.a', 'libapi_gen_util.a', + 'libautofill_content_browser.a', + 'libautofill_content_common.a', + 'libautofill_content_mojo_bindings.a', + 'libautofill_content_renderer.a', + 'libautofill_core_browser.a', + 'libautofill_core_common.a', + 'libautofill_server_proto.a', + 'libos_crypt.a', 'libbrowsing_data.a', 'libchrome_api.a', 'libchrome_zlib.a', 'libcld2_static.a', 'libcontent_settings_core_common.a', 'libcrx_file.a', + 'libdata_use_measurement_core.a', 'libdevice_usb.a', 'libextensions_api.a', 'libextensions_api_registration.a', @@ -67,6 +92,8 @@ 'libextensions_common_constants.a', 'libextensions_renderer.a', 'libextensions_utility.a', + 'libgoogle_apis.a', + 'libgoogle_core_browser.a', 'libguest_view_browser.a', 'libguest_view_common.a', 'libguest_view_renderer.a', @@ -74,12 +101,18 @@ 'libmojo_cpp_system.a', 'libmojo_cpp_bindings.a', 'libmojo_js_bindings.a', + 'libphonenumber.a', + 'libphonenumber_without_metadata.a', 'libpref_registry.a', 'libre2.a', + 'libsearch_engines.a', 'libsnappy.a', + 'libsignin_core_browser.a', + 'libsignin_core_common.a', 'libsyncable_prefs.a', 'libui_zoom.a', 'libvariations.a', + 'libvariations_net.a', 'libweb_cache_browser.a', 'libweb_cache_mojo_bindings.a', 'libweb_modal.a', @@ -129,25 +162,33 @@ 'extensions/renderer', 'extensions/strings', 'extensions/utility', + 'google_apis/gaia', + 'sql', 'sync/api', 'sync/base', 'sync/internal_api', + 'third_party/protobuf', + 'components/autofill', 'components/content_settings', 'components/user_prefs', 'components/pref_registry', 'components/syncable_prefs', 'components/keyed_service', 'components/web_modal', + 'components/webdata', 'components/crx_file', 'components/ui' ] GENERATED_INCLUDE_DIRS = [ 'chrome', + 'components/autofill', 'extensions', 'services', + 'protoc_out/components/autofill', ] OTHER_HEADERS = [ 'chrome/common/chrome_isolated_world_ids.h', + 'chrome/browser/sync/glue/sync_start_util.h', ] OTHER_DIRS = [ 'build',