Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index ea7f6ba..76c26f5 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -54,6 +54,7 @@
include $(LOCAL_PATH)/content/content_resources.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_utility.target.linux-x86.mk
include $(LOCAL_PATH)/content/java_set_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/content/java_view_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/speech_recognition_error_java.target.linux-x86.mk
@@ -91,7 +92,6 @@
include $(LOCAL_PATH)/net/net_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/net/net_resources.target.linux-x86.mk
include $(LOCAL_PATH)/net/private_key_types_java.target.linux-x86.mk
-include $(LOCAL_PATH)/printing/printing.target.linux-x86.mk
include $(LOCAL_PATH)/sandbox/sandbox.target.linux-x86.mk
include $(LOCAL_PATH)/sandbox/sandbox_services.target.linux-x86.mk
include $(LOCAL_PATH)/sandbox/sandbox_services_headers.target.linux-x86.mk
@@ -150,7 +150,6 @@
include $(LOCAL_PATH)/third_party/WebKit/Source/platform/make_platform_derived_sources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/web/picker_resources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/web/webkit.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/weborigin/weborigin.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/WebKit/public/blink.target.linux-x86.mk
@@ -216,23 +215,24 @@
include $(LOCAL_PATH)/third_party/zlib/google/zip.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/zlib/minizip.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/zlib/zlib.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/android/window_open_disposition_java.target.linux-x86.mk
include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86.mk
-include $(LOCAL_PATH)/ui/events/events.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/events/events_base.target.linux-x86.mk
include $(LOCAL_PATH)/ui/gfx/gfx.target.linux-x86.mk
include $(LOCAL_PATH)/ui/gfx/gfx_jni_headers.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/keycode_converter.target.linux-x86.mk
include $(LOCAL_PATH)/ui/native_theme/native_theme.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/resources/ui_resources.target.linux-x86.mk
include $(LOCAL_PATH)/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk
include $(LOCAL_PATH)/ui/snapshot/snapshot.target.linux-x86.mk
include $(LOCAL_PATH)/ui/surface/surface.target.linux-x86.mk
include $(LOCAL_PATH)/ui/ui.target.linux-x86.mk
-include $(LOCAL_PATH)/ui/ui_jni_headers.target.linux-x86.mk
-include $(LOCAL_PATH)/ui/ui_resources.target.linux-x86.mk
-include $(LOCAL_PATH)/ui/window_open_disposition_java.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/ui_base_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/url/url_lib.target.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/generate_trig_table.host.linux-x86.mk
include $(LOCAL_PATH)/v8/tools/gyp/js2c.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
@@ -240,13 +240,13 @@
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/child/overscroller_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/child/webkit_child.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/common/gpu/webkit_gpu.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/common/user_agent/user_agent.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/common/user_agent/webkit_version.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/common/webkit_common.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/glue/glue.target.linux-x86.mk
-include $(LOCAL_PATH)/webkit/glue/glue_child.target.linux-x86.mk
-include $(LOCAL_PATH)/webkit/glue/overscroller_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/renderer/webkit_renderer.target.linux-x86.mk