Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25

1 files changed, 26 insertions, 22 deletions

diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk
index 8111cd2ddf..04c45bbd8c 100644
--- a/GypAndroid.linux-arm.mk
+++ b/GypAndroid.linux-arm.mk
@@ -45,6 +45,7 @@ include $(LOCAL_PATH)/components/web_contents_delegate_android.target.linux-arm.
 include $(LOCAL_PATH)/components/web_contents_delegate_android_jni_headers.target.linux-arm.mk
 include $(LOCAL_PATH)/components/webdata_common.target.linux-arm.mk
 include $(LOCAL_PATH)/content/browser/devtools/devtools_resources.target.linux-arm.mk
+include $(LOCAL_PATH)/content/browser/service_worker/database_proto.target.linux-arm.mk
 include $(LOCAL_PATH)/content/browser/speech/proto/speech_proto.target.linux-arm.mk
 include $(LOCAL_PATH)/content/common_aidl.target.linux-arm.mk
 include $(LOCAL_PATH)/content/content_app_both.target.linux-arm.mk
@@ -91,10 +92,11 @@ include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-arm.mk
 include $(LOCAL_PATH)/media/player_android.target.linux-arm.mk
 include $(LOCAL_PATH)/media/shared_memory_support.target.linux-arm.mk
 include $(LOCAL_PATH)/media/video_capture_android_jni_headers.target.linux-arm.mk
-include $(LOCAL_PATH)/mojo/mojo_bindings.target.linux-arm.mk
 include $(LOCAL_PATH)/mojo/mojo_common_lib.target.linux-arm.mk
+include $(LOCAL_PATH)/mojo/mojo_cpp_bindings.target.linux-arm.mk
 include $(LOCAL_PATH)/mojo/mojo_environment_chromium.target.linux-arm.mk
 include $(LOCAL_PATH)/mojo/mojo_environment_chromium_impl.target.linux-arm.mk
+include $(LOCAL_PATH)/mojo/mojo_js_bindings.target.linux-arm.mk
 include $(LOCAL_PATH)/mojo/mojo_js_bindings_lib.target.linux-arm.mk
 include $(LOCAL_PATH)/mojo/mojo_service_manager.target.linux-arm.mk
 include $(LOCAL_PATH)/mojo/mojo_shell_bindings.target.linux-arm.mk
@@ -123,9 +125,10 @@ include $(LOCAL_PATH)/skia/skia_opts.target.linux-arm.mk
 include $(LOCAL_PATH)/skia/skia_opts_neon.target.linux-arm.mk
 include $(LOCAL_PATH)/sql/sql.target.linux-arm.mk
 include $(LOCAL_PATH)/testing/gtest_prod.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/aggregate_generated_bindings.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_core_generated_aggregate.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_modules_generated_aggregate.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_jinja_templates.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_yacc_tables.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_lex_yacc_tables.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/core_bindings_generated.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/generated_bindings.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/global_constructors_idls.target.linux-arm.mk
@@ -149,25 +152,26 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_prerequisites.targe
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_remaining.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_rendering.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_svg.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_audits_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_audits_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_console_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_core_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_devices_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_elements_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_extensions_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_heap_snapshot_worker_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_layers_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_network_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_profiler_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_resources_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_script_formatter_worker_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_search_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_source_frame_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_sources_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_temp_storage_shared_worker_module.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_timeline_module.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_layers_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_network_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_profiles_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_resources_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_scripts_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_search_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_timeline_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_heap_snapshot_worker_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_script_formatter_worker_js.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_temp_storage_shared_worker_js.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_extension_api.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_frontend_resources.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_html.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/frontend_protocol_sources.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/generate_devtools_grd.target.linux-arm.mk
@@ -255,10 +259,8 @@ include $(LOCAL_PATH)/third_party/webrtc/common_video/common_video.target.linux-
 include $(LOCAL_PATH)/third_party/webrtc/modules/CNG.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/webrtc/modules/G711.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/webrtc/modules/G722.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/webrtc/modules/NetEq.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/webrtc/modules/NetEq4.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/webrtc/modules/PCM16B.target.linux-arm.mk
-include $(LOCAL_PATH)/third_party/webrtc/modules/acm2.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding_module.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/webrtc/modules/audio_device.target.linux-arm.mk
@@ -324,6 +326,8 @@ include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.arm.host.linux-arm.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8.target.linux-arm.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_base.arm.host.linux-arm.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_base.arm.target.linux-arm.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_libbase.arm.host.linux-arm.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_libbase.arm.target.linux-arm.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk
 include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.linux-arm.mk
 include $(LOCAL_PATH)/webkit/child/overscroller_jni_headers.target.linux-arm.mk