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

Unified Diff: components/cronet.gypi

Issue 933293003: [Cronet] Make Cronet buildable on regular Android bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix url.gyp formatting. Created 5 years, 10 months 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
« no previous file with comments | « no previous file | net/net.gyp » ('j') | url/url.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index f492d41e6dda9ba14d8b172271efdaa9460c9160..8e6893d87f374d2add26f30d59f3b4442adeac9b 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -100,18 +100,20 @@
{
'target_name': 'cronet_static',
'type': 'static_library',
+ 'defines': [
+ 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
+ 'DISABLE_FILE_SUPPORT=1',
+ 'DISABLE_FTP_SUPPORT=1',
+ ],
'dependencies': [
'../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
'cronet_jni_headers',
'cronet_url_request_context_config_list',
'cronet_url_request_java',
'cronet_version',
'metrics',
- '../net/net.gyp:net',
+ '../net/net.gyp:net_small',
],
'sources': [
'cronet/android/chromium_url_request.cc',
@@ -178,8 +180,8 @@
'dependencies': [
'cronet_static',
'../base/base.gyp:base',
- '../net/net.gyp:net',
- '../url/url.gyp:url_lib',
+ '../net/net.gyp:net_small',
+ '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
],
},
{ # cronet_stub.jar defines HttpUrlRequest interface and provides its
« no previous file with comments | « no previous file | net/net.gyp » ('j') | url/url.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698