Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 7879d7c..c3ba074 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -15,6 +15,7 @@
include $(LOCAL_PATH)/base/base.target.linux-x86.mk
include $(LOCAL_PATH)/base/base_i18n.target.linux-x86.mk
include $(LOCAL_PATH)/base/base_java_activity_state.target.linux-x86.mk
+include $(LOCAL_PATH)/base/base_java_memory_pressure_level_list.target.linux-x86.mk
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
@@ -24,12 +25,12 @@
include $(LOCAL_PATH)/cc/cc.target.linux-x86.mk
include $(LOCAL_PATH)/components/auto_login_parser.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_browser.target.linux-x86.mk
-include $(LOCAL_PATH)/components/autofill_common.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_content_browser.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_content_risk_proto.target.linux-x86.mk
+include $(LOCAL_PATH)/components/autofill_core_common.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_regexes.target.linux-x86.mk
-include $(LOCAL_PATH)/components/component_resources.target.linux-x86.mk
+include $(LOCAL_PATH)/components/component_strings.target.linux-x86.mk
include $(LOCAL_PATH)/components/encryptor.target.linux-x86.mk
include $(LOCAL_PATH)/components/navigation_interception.target.linux-x86.mk
include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.linux-x86.mk
@@ -61,6 +62,7 @@
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
+include $(LOCAL_PATH)/content/speech_recognition_error_java.target.linux-x86.mk
include $(LOCAL_PATH)/crypto/crypto.target.linux-x86.mk
include $(LOCAL_PATH)/google_apis/google_apis.target.linux-x86.mk
include $(LOCAL_PATH)/gpu/command_buffer/gles2_utils.target.linux-x86.mk
@@ -107,6 +109,7 @@
include $(LOCAL_PATH)/skia/skia_opts.target.linux-x86.mk
include $(LOCAL_PATH)/sql/sql.target.linux-x86.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/blink_common.target.linux-x86.mk
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
@@ -152,9 +155,10 @@
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
-include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/angle/src/translator_common.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/angle/src/translator_glsl.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.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/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
@@ -241,6 +245,7 @@
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/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