Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1045)

Unified Diff: components/cronet.gypi

Issue 1448583003: [Cronet] Add QUIC experimental params (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@experiment_ops
Patch Set: Fix build Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 71d2794ec6eaf7413412921e7663b2586ebde9e5..8432365baa90f2f8e92eac98d61f45e62b4e7a2a 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -164,6 +164,7 @@
],
'dependencies': [
'../net/net.gyp:net_small',
+ '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
],
'conditions': [
['enable_data_reduction_proxy_support==1',
@@ -183,6 +184,7 @@
'dependencies': [
'../base/base.gyp:base_i18n',
'../net/net.gyp:net',
+ '../url/url.gyp:url_lib',
],
'conditions': [
['enable_data_reduction_proxy_support==1',
@@ -205,7 +207,6 @@
'cronet_static_small',
'../base/base.gyp:base',
'../net/net.gyp:net_small',
- '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
],
},
{ # cronet_api.jar defines Cronet API and provides implementation of
@@ -363,7 +364,6 @@
'../net/net.gyp:net_quic_proto',
'../net/net.gyp:net_test_support',
'../net/net.gyp:simple_quic_tools',
- '../url/url.gyp:url_lib',
'../base/base.gyp:base_i18n',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -446,6 +446,36 @@
'includes': [ '../build/java_apk.gypi' ],
},
{
+ 'target_name': 'cronet_unittests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ 'cronet_static',
+ 'metrics',
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../testing/gtest.gyp:gtest',
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ 'sources': [
+ 'cronet/run_all_unittests.cc',
+ 'cronet/url_request_context_config_unittest.cc',
+ 'cronet/histogram_manager_unittest.cc',
+ ],
+ },
+ {
+ 'target_name': 'cronet_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'cronet_unittests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'cronet_unittests',
+ },
+ 'includes': [
+ '../build/apk_test.gypi',
+ ],
+ },
+ {
'target_name': 'cronet_package',
'type': 'none',
'dependencies': [
« no previous file with comments | « components/components_tests.gyp ('k') | components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698