Merge from Chromium at DEPS revision r216972
This commit was generated by merge_to_master.py.
Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 5ca8972..06bb9bf 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -90,8 +90,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)/ppapi/ppapi_c.target.linux-x86.mk
-include $(LOCAL_PATH)/ppapi/ppapi_shared.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
@@ -154,6 +152,7 @@
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
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
@@ -240,14 +239,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/plugins/plugins_common.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/support/plugins.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