Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89

1 files changed, 57 insertions, 1 deletions

diff --git a/GypAndroid.darwin-arm.mk b/GypAndroid.darwin-arm.mk
index 33f2c78efd..5c2b5d3918 100644
--- a/GypAndroid.darwin-arm.mk
+++ b/GypAndroid.darwin-arm.mk
@@ -115,7 +115,7 @@ include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/aggregate_generated_bindings.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_jinja_templates.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/cached_yacc_tables.target.darwin-arm.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/event_interfaces.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/core_bindings_generated.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/generated_bindings.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/global_constructors_idls.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/individual_generated_bindings.target.darwin-arm.mk
@@ -195,10 +195,21 @@ include $(LOCAL_PATH)/third_party/leveldatabase/leveldatabase.target.darwin-arm.
 include $(LOCAL_PATH)/third_party/libevent/libevent.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libjingle/libjingle.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libjingle/libjingle_p2p_constants.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libjingle/libjingle_webrtc.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libjingle/libjingle_webrtc_common.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libjingle/libpeerconnection.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libjpeg/libjpeg.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libphonenumber/libphonenumber.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libpng/libpng.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libsrtp/libsrtp.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libvpx/gen_asm_offsets_vp8.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libvpx/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libvpx/libvpx.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libvpx/libvpx_asm_offsets_vp8.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libvpx/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libvpx/libvpx_intrinsics_neon.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libvpx/libvpx_obj_int_extract.host.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libwebp/libwebp.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libwebp/libwebp_dec.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libwebp/libwebp_demux.target.darwin-arm.mk
@@ -208,6 +219,8 @@ include $(LOCAL_PATH)/third_party/libwebp/libwebp_enc.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libwebp/libwebp_utils.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libxml/libxml.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/libxslt/libxslt.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libyuv/libyuv.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/libyuv/libyuv_neon.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/lzma_sdk/lzma_sdk.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/mesa/mesa_headers.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/modp_b64/modp_b64.target.darwin-arm.mk
@@ -223,6 +236,49 @@ include $(LOCAL_PATH)/third_party/re2/re2.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/usrsctp/usrsctplib.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/common_audio/common_audio.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/common_audio/common_audio_neon.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/common_video/common_video.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/CNG.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/G711.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/G722.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/NetEq.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/NetEq4.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/PCM16B.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/acm2.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding_module.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_conference_mixer.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_device.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_processing.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audio_processing_neon.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/audioproc_debug_proto.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/bitrate_controller.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/iLBC.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/iSAC.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/iSACFix.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/isac_neon.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/media_file.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/paced_sender.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/remote_bitrate_estimator.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/rtp_rtcp.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/video_capture_module.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/video_processing.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/video_render_module.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/webrtc_i420.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/webrtc_opus.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/webrtc_utility.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/modules/webrtc_video_coding.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/cpu_features_android.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/system_wrappers/source/system_wrappers.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/video_engine/video_engine_core.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/webrtc/voice_engine/voice_engine.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/zlib/google/zip.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/zlib/minizip.target.darwin-arm.mk