Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e

1 files changed, 14 insertions, 4 deletions

diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 76c26f57fd..8b44e2e484 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -8,8 +8,9 @@ include $(LOCAL_PATH)/android_webview/All.target.linux-x86.mk
 include $(LOCAL_PATH)/android_webview/android_webview_common.target.linux-x86.mk
 include $(LOCAL_PATH)/android_webview/android_webview_pak.target.linux-x86.mk
 include $(LOCAL_PATH)/android_webview/libwebviewchromium.target.linux-x86.mk
-include $(LOCAL_PATH)/android_webview/native/android_jar_jni_headers.target.linux-x86.mk
 include $(LOCAL_PATH)/android_webview/native/android_webview_native_jni.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86.mk
 include $(LOCAL_PATH)/android_webview/native/webview_native.target.linux-x86.mk
 include $(LOCAL_PATH)/base/allocator/allocator_extension_thunks.target.linux-x86.mk
 include $(LOCAL_PATH)/base/base.target.linux-x86.mk
@@ -54,11 +55,12 @@ include $(LOCAL_PATH)/content/content_renderer.target.linux-x86.mk
 include $(LOCAL_PATH)/content/content_resources.target.linux-x86.mk
 include $(LOCAL_PATH)/content/content_utility.target.linux-x86.mk
 include $(LOCAL_PATH)/content/java_set_jni_headers.target.linux-x86.mk
-include $(LOCAL_PATH)/content/java_view_jni_headers.target.linux-x86.mk
 include $(LOCAL_PATH)/content/page_transition_types_java.target.linux-x86.mk
+include $(LOCAL_PATH)/content/popup_item_type_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)/gin/gin.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
 include $(LOCAL_PATH)/gpu/command_buffer_client.target.linux-x86.mk
@@ -71,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gles2_implementation.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/gpu.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/gpu_config.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/gpu_ipc.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk
 include $(LOCAL_PATH)/ipc/ipc.target.linux-x86.mk
 include $(LOCAL_PATH)/jingle/jingle_glue.target.linux-x86.mk
 include $(LOCAL_PATH)/media/media.target.linux-x86.mk
@@ -92,10 +95,13 @@ include $(LOCAL_PATH)/net/net_errors_java.target.linux-x86.mk
 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)/printing/printing.target.linux-x86.mk
+include $(LOCAL_PATH)/printing/printing_jni_headers.target.linux-x86.mk
 include $(LOCAL_PATH)/sandbox/sandbox.target.linux-x86.mk
 include $(LOCAL_PATH)/sandbox/sandbox_services.target.linux-x86.mk
 include $(LOCAL_PATH)/sandbox/sandbox_services_headers.target.linux-x86.mk
 include $(LOCAL_PATH)/sandbox/seccomp_bpf.target.linux-x86.mk
+include $(LOCAL_PATH)/sandbox/seccomp_bpf_helpers.target.linux-x86.mk
 include $(LOCAL_PATH)/sdch/sdch.target.linux-x86.mk
 include $(LOCAL_PATH)/skia/skia.target.linux-x86.mk
 include $(LOCAL_PATH)/skia/skia_chrome.target.linux-x86.mk
@@ -144,15 +150,17 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_extension_api.
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_html.target.linux-x86.mk
 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/heap/blink_heap.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/platform/blink_prerequisites.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/platform/make_platform_derived_sources.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/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/WebKit/public/blink_generate_devtools_grd.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
@@ -163,7 +171,6 @@ include $(LOCAL_PATH)/third_party/freetype/ft2.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/icu/icudata.host.linux-x86.mk
-include $(LOCAL_PATH)/third_party/icu/icudata.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/icu/icui18n.host.linux-x86.mk
 include $(LOCAL_PATH)/third_party/icu/icui18n.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/icu/icuuc.host.linux-x86.mk
@@ -199,6 +206,7 @@ include $(LOCAL_PATH)/third_party/protobuf/protobuf_lite.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/protobuf/protoc.host.linux-x86.mk
 include $(LOCAL_PATH)/third_party/qcms/qcms.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/re2/re2.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.linux-x86.mk
@@ -218,9 +226,11 @@ include $(LOCAL_PATH)/third_party/zlib/zlib.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/android/window_open_disposition_java.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/events/events.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/events/events_base.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/gfx/gfx_view_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