components/cronet.gypi - Issue 1839803002: Remove net & url small, iOS ICU alternatives, unit tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/cronet.gypi

Issue 1839803002: Remove net & url small, iOS ICU alternatives, unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolved rebase conflicts Created 4 years, 9 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

Index: components/cronet.gypi

diff --git a/components/cronet.gypi b/components/cronet.gypi

index ce5a031a183e27f527d5cc88fe84da0d6d3f6939..45ae7847f5f3f74cbc37ba4baac00f4832050a09 100644

--- a/components/cronet.gypi

+++ b/components/cronet.gypi

@@ -179,13 +179,13 @@

'target_name': 'cronet_static_small',

mef 2016/04/01 20:42:49 do we still need cronet_static_small vs cronet_sta

kapishnikov 2016/04/04 20:17:26 cronet_static_small depends on components/componen

'type': 'static_library',

'defines': [

- 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',

+ 'USE_PLATFORM_ICU_ALTERNATIVES=1',

mef 2016/04/01 20:42:49 should this be conditioned on 'use_platform_icu_al

kapishnikov 2016/04/04 20:17:26 Done. Actually removed USE_PLATFORM_ICU_ALTERNATIV

'DISABLE_FILE_SUPPORT=1',

'DISABLE_FTP_SUPPORT=1',

'dependencies': [

- '../net/net.gyp:net_small',

- '../url/url.gyp:url_lib_use_icu_alternatives_on_android',

+ '../net/net.gyp:net',

+ '../url/url.gyp:url_lib',

'conditions': [

['enable_data_reduction_proxy_support==1',

@@ -227,7 +227,7 @@

'dependencies': [

'cronet_static_small',

'../base/base.gyp:base',

- '../net/net.gyp:net_small',

+ '../net/net.gyp:net',

'ldflags': [

'-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/components/cronet/android/only_jni_exports.lst',

« no previous file with comments | « build/common.gypi ('k') | components/cronet/android/BUILD.gn » ('j') | components/cronet/android/BUILD.gn » ('J')