Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 61daece..ac62da4 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -146,8 +146,9 @@
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_common.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/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
@@ -156,8 +157,7 @@
include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/angle_dx11/src/preprocessor.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/angle_dx11/src/translator_common.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/angle_dx11/src/translator_glsl.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/angle_dx11/src/translator.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/expat/expat.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/freetype/ft2.target.linux-x86.mk
@@ -217,6 +217,9 @@
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/base/strings/ui_strings.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/events/events.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