Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 69b80e1..da0a22f 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -19,7 +19,6 @@
include $(LOCAL_PATH)/base/base_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/base/base_prefs.target.linux-x86.mk
include $(LOCAL_PATH)/base/base_static.target.linux-x86.mk
-include $(LOCAL_PATH)/base/symbolize.target.linux-x86.mk
include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86.mk
include $(LOCAL_PATH)/cc/cc.target.linux-x86.mk
include $(LOCAL_PATH)/components/auto_login_parser.target.linux-x86.mk
@@ -58,7 +57,6 @@
include $(LOCAL_PATH)/content/content_resources.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_utility.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_worker.target.linux-x86.mk
-include $(LOCAL_PATH)/content/generate_content_resources.target.linux-x86.mk
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
@@ -82,7 +80,6 @@
include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_asm.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_mmx.target.linux-x86.mk
-include $(LOCAL_PATH)/media/media_player_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_sse.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_sse2.target.linux-x86.mk
include $(LOCAL_PATH)/media/player_android.target.linux-x86.mk
@@ -113,7 +110,9 @@
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/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/bindings/deprecated_perl_bindings_sources.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.linux-x86.mk
@@ -237,26 +236,25 @@
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/base/webkit_base.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_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/glue_common.target.linux-x86.mk
-include $(LOCAL_PATH)/webkit/support/glue_renderer.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/support/webkit_common.target.linux-x86.mk
include $(LOCAL_PATH)/webkit/support/webkit_media.target.linux-x86.mk
-include $(LOCAL_PATH)/webkit/support/webkit_resources.target.linux-x86.mk
-include $(LOCAL_PATH)/webkit/support/webkit_strings.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
include $(LOCAL_PATH)/webkit/webkit_storage_renderer.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/webkit_strings.target.linux-x86.mk
# "gyp_all_modules" is a concatenation of the "gyp_all_modules" targets from
# all the included sub-makefiles. This is just here to clarify.