Merge from Chromium at DEPS revision 225410
This commit was generated by merge_to_master.py.
Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 28e5f8c..61daece 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -146,6 +146,7 @@
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/platform/blink_platform.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/web/blink_common.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
@@ -219,6 +220,7 @@
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/shell_dialogs.target.linux-x86.mk
include $(LOCAL_PATH)/ui/snapshot/snapshot.target.linux-x86.mk
@@ -239,12 +241,12 @@
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
-include $(LOCAL_PATH)/webkit/support/glue.target.linux-x86.mk
-include $(LOCAL_PATH)/webkit/support/glue_child.target.linux-x86.mk
-include $(LOCAL_PATH)/webkit/support/overscroller_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/webkit_resources.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/webkit_storage_browser.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/webkit_storage_common.target.linux-x86.mk