Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index ea353b6..4278dcb 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -15,6 +15,7 @@
include $(LOCAL_PATH)/base/allocator/allocator_extension_thunks.target.linux-x86.mk
include $(LOCAL_PATH)/base/base.target.linux-x86.mk
include $(LOCAL_PATH)/base/base_i18n.target.linux-x86.mk
+include $(LOCAL_PATH)/base/base_java_activity_state.target.linux-x86.mk
include $(LOCAL_PATH)/base/base_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/base/base_static.target.linux-x86.mk
include $(LOCAL_PATH)/base/symbolize.target.linux-x86.mk
@@ -49,8 +50,6 @@
include $(LOCAL_PATH)/content/java_set_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/content/page_transition_types_java.target.linux-x86.mk
include $(LOCAL_PATH)/content/result_codes_java.target.linux-x86.mk
-include $(LOCAL_PATH)/content/surface_jni_headers.target.linux-x86.mk
-include $(LOCAL_PATH)/content/surface_texture_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/crypto/crypto.target.linux-x86.mk
include $(LOCAL_PATH)/google_apis/google_apis.target.linux-x86.mk
include $(LOCAL_PATH)/gpu/command_buffer/gles2_utils.target.linux-x86.mk
@@ -96,49 +95,50 @@
include $(LOCAL_PATH)/skia/skia_opts.target.linux-x86.mk
include $(LOCAL_PATH)/sql/sql.target.linux-x86.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/yarr.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/Platform/Platform.gyp/webkit_platform.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/ThirdParty/glu/libtess.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WTF/WTF.gyp/wtf.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WTF/WTF.gyp/wtf_config.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/debugger_script_source.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/generate_inspector_protocol_version.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/generate_settings.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/generate_supplemental_dependency.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/injected_canvas_script_source.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/injected_script_source.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/inspector_overlay_page.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/inspector_protocol_sources.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_bindings.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_bindings_sources.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_dom.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_html.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_platform.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_platform_geometry.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_prerequisites.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_remaining.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_rendering.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_svg.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_ace_editor_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_audits_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_codemirror_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_css.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_elements_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_network_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_profiles_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_resources_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_scripts_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_timeline_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_heap_snapshot_worker_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_script_formatter_worker_js.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/devtools_extension_api.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/devtools_html.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/generate_devtools_grd.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/skia_webkit.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit_wtf_support.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/supplemental_dependencies.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/debugger_script_source.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_inspector_protocol_version.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_settings.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_canvas_script_source.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_script_source.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/inspector_overlay_page.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/inspector_protocol_sources.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/make_derived_sources.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_derived.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_dom.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_html.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_platform.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_platform_geometry.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_prerequisites.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_remaining.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_rendering.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/webcore_svg.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_audits_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_network_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_profiles_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_resources_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_scripts_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_timeline_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_heap_snapshot_worker_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_script_formatter_worker_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_extension_api.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_html.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/frontend_protocol_sources.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/generate_devtools_grd.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf_config.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/translator_common.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/translator_glsl.target.linux-x86.mk
@@ -196,9 +196,14 @@
include $(LOCAL_PATH)/third_party/yasm/genversion.host.linux-x86.mk
include $(LOCAL_PATH)/third_party/yasm/re2c.host.linux-x86.mk
include $(LOCAL_PATH)/third_party/yasm/yasm.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/zlib/minizip.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/zlib/zip.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/zlib/zlib.target.linux-x86.mk
include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86.mk
include $(LOCAL_PATH)/ui/gl/gl.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/gl/gl_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/gl/surface_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/gl/surface_texture_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/ui/native_theme/native_theme.target.linux-x86.mk
include $(LOCAL_PATH)/ui/shell_dialogs.target.linux-x86.mk
include $(LOCAL_PATH)/ui/snapshot/snapshot.target.linux-x86.mk
@@ -207,11 +212,11 @@
include $(LOCAL_PATH)/ui/ui_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/ui/ui_resources.target.linux-x86.mk
include $(LOCAL_PATH)/v8/tools/gyp/js2c.host.linux-x86.mk
-include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.host.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.ia32.host.linux-x86.mk
include $(LOCAL_PATH)/v8/tools/gyp/v8.target.linux-x86.mk
-include $(LOCAL_PATH)/v8/tools/gyp/v8_base.host.linux-x86.mk
-include $(LOCAL_PATH)/v8/tools/gyp/v8_base.target.linux-x86.mk
-include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.host.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_base.ia32.host.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_base.ia32.target.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk
include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/compositor_bindings/webkit_compositor_support.target.linux-x86.mk