Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

1 files changed, 30 insertions, 24 deletions

diff --git a/GypAndroid.darwin-x86.mk b/GypAndroid.darwin-x86.mk
index 8844c63f21..39fa1006fc 100644
--- a/GypAndroid.darwin-x86.mk
+++ b/GypAndroid.darwin-x86.mk
@@ -25,9 +25,10 @@ include $(LOCAL_PATH)/cc/cc.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/autofill_browser.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/autofill_common.target.darwin-x86.mk
+include $(LOCAL_PATH)/components/autofill_content_browser.target.darwin-x86.mk
+include $(LOCAL_PATH)/components/autofill_content_risk_proto.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/autofill_jni_headers.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/autofill_regexes.target.darwin-x86.mk
-include $(LOCAL_PATH)/components/autofill_risk_proto.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/component_resources.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/encryptor.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/navigation_interception.target.darwin-x86.mk
@@ -46,8 +47,8 @@ include $(LOCAL_PATH)/content/common_aidl.target.darwin-x86.mk
 include $(LOCAL_PATH)/content/content.target.darwin-x86.mk
 include $(LOCAL_PATH)/content/content_app.target.darwin-x86.mk
 include $(LOCAL_PATH)/content/content_browser.target.darwin-x86.mk
+include $(LOCAL_PATH)/content/content_child.target.darwin-x86.mk
 include $(LOCAL_PATH)/content/content_common.target.darwin-x86.mk
-include $(LOCAL_PATH)/content/content_common_child.target.darwin-x86.mk
 include $(LOCAL_PATH)/content/content_gpu.target.darwin-x86.mk
 include $(LOCAL_PATH)/content/content_jni_headers.target.darwin-x86.mk
 include $(LOCAL_PATH)/content/content_plugin.target.darwin-x86.mk
@@ -106,30 +107,30 @@ include $(LOCAL_PATH)/skia/skia.target.darwin-x86.mk
 include $(LOCAL_PATH)/skia/skia_opts.target.darwin-x86.mk
 include $(LOCAL_PATH)/sql/sql.target.darwin-x86.mk
 include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/Platform/Platform.gyp/webkit_platform.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/skia_webkit.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/supplemental_dependencies.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/debugger_script_source.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_inspector_protocol_version.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_test_support_idls.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_canvas_script_source.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_script_source.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/inspector_overlay_page.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/inspector_protocol_sources.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/make_derived_sources.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_derived.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_dom.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_html.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_platform.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_platform_geometry.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_prerequisites.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_remaining.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_rendering.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_svg.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_test_support_idls.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/injected_canvas_script_source.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/injected_script_source.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/inspector_instrumentation_sources.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/inspector_overlay_page.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/inspector_protocol_sources.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/make_derived_sources.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_derived.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_dom.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_html.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_platform.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_platform_geometry.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_prerequisites.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_remaining.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_rendering.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_svg.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_audits_js.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.darwin-x86.mk
@@ -150,6 +151,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules.target.darwin-x8
 include $(LOCAL_PATH)/third_party/WebKit/Source/weborigin/weborigin.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf_config.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/angle/src/translator_common.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/angle/src/translator_glsl.target.darwin-x86.mk
@@ -181,6 +183,7 @@ include $(LOCAL_PATH)/third_party/libwebp/libwebp_enc.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/libwebp/libwebp_utils.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/libxml/libxml.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/libxslt/libxslt.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/lzma_sdk/lzma_sdk.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/mesa/mesa_headers.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/modp_b64/modp_b64.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/npapi/npapi.target.darwin-x86.mk
@@ -222,6 +225,7 @@ include $(LOCAL_PATH)/ui/surface/surface.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/ui.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/ui_jni_headers.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/ui_resources.target.darwin-x86.mk
+include $(LOCAL_PATH)/url/url_lib.target.darwin-x86.mk
 include $(LOCAL_PATH)/v8/tools/gyp/js2c.host.darwin-x86.mk
 include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8.target.darwin-x86.mk
@@ -230,20 +234,22 @@ include $(LOCAL_PATH)/v8/tools/gyp/v8_base.ia32.target.darwin-x86.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk
+include $(LOCAL_PATH)/webkit/common/user_agent/user_agent.target.darwin-x86.mk
+include $(LOCAL_PATH)/webkit/common/user_agent/webkit_version.target.darwin-x86.mk
+include $(LOCAL_PATH)/webkit/plugins/plugins_common.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/glue.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/glue_common.target.darwin-x86.mk
+include $(LOCAL_PATH)/webkit/support/glue_renderer.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/overscroller_jni_headers.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/plugins.target.darwin-x86.mk
-include $(LOCAL_PATH)/webkit/support/plugins_common.target.darwin-x86.mk
-include $(LOCAL_PATH)/webkit/support/user_agent.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/webkit_base.target.darwin-x86.mk
+include $(LOCAL_PATH)/webkit/support/webkit_common.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/webkit_media.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/webkit_resources.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/webkit_storage.target.darwin-x86.mk
 include $(LOCAL_PATH)/webkit/support/webkit_strings.target.darwin-x86.mk
-include $(LOCAL_PATH)/webkit/support/webkit_version.target.darwin-x86.mk
 
 # "gyp_all_modules" is a concatenation of the "gyp_all_modules" targets from
 # all the included sub-makefiles. This is just here to clarify.