diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/components/cronet | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/components/cronet')
| -rw-r--r-- | chromium/components/cronet/android/cronet_test_instrumentation_apk.isolate | 18 | ||||
| -rw-r--r-- | chromium/components/cronet/cronet_static.gypi | 9 |
2 files changed, 26 insertions, 1 deletions
diff --git a/chromium/components/cronet/android/cronet_test_instrumentation_apk.isolate b/chromium/components/cronet/android/cronet_test_instrumentation_apk.isolate new file mode 100644 index 00000000000..be1003932ff --- /dev/null +++ b/chromium/components/cronet/android/cronet_test_instrumentation_apk.isolate @@ -0,0 +1,18 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'conditions': [ + ['OS=="android"', { + 'variables': { + 'files': [ + '<(DEPTH)/net/data/ssl/certificates/quic_test.example.com.crt', + '<(DEPTH)/net/data/ssl/certificates/quic_test.example.com.key', + '<(DEPTH)/net/data/ssl/certificates/quic_test.example.com.key.pkcs8', + '<(DEPTH)/net/data/ssl/certificates/quic_test.example.com.key.sct', + ], + }, + }], + ], +} diff --git a/chromium/components/cronet/cronet_static.gypi b/chromium/components/cronet/cronet_static.gypi index 22d2a6f4848..826809b2c39 100644 --- a/chromium/components/cronet/cronet_static.gypi +++ b/chromium/components/cronet/cronet_static.gypi @@ -8,7 +8,8 @@ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', 'cronet_jni_headers', - 'cronet_url_request_java', + 'chromium_url_request_java', + 'url_request_error_java', 'cronet_version', 'cronet_version_header', 'metrics', @@ -18,6 +19,8 @@ 'android/chromium_url_request.h', 'android/chromium_url_request_context.cc', 'android/chromium_url_request_context.h', + 'android/cronet_bidirectional_stream_adapter.cc', + 'android/cronet_bidirectional_stream_adapter.h', 'android/cronet_in_memory_pref_store.cc', 'android/cronet_in_memory_pref_store.h', 'android/cronet_library_loader.cc', @@ -30,10 +33,14 @@ 'android/cronet_url_request_adapter.h', 'android/cronet_url_request_context_adapter.cc', 'android/cronet_url_request_context_adapter.h', + 'android/io_buffer_with_byte_buffer.cc', + 'android/io_buffer_with_byte_buffer.h', 'android/url_request_adapter.cc', 'android/url_request_adapter.h', 'android/url_request_context_adapter.cc', 'android/url_request_context_adapter.h', + 'android/url_request_error.cc', + 'android/url_request_error.h', 'android/wrapped_channel_upload_element_reader.cc', 'android/wrapped_channel_upload_element_reader.h', 'histogram_manager.cc', |