diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 18:32:47 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 18:32:47 +0000 |
| commit | de36240ae4c0ccec2d96b17e2390fd89b936e94d (patch) | |
| tree | 10d06c71f7b38d6ed439ad7a67af604c1263a0e0 /net/net.gyp | |
| parent | cbdf6d505803f1467d90f5cfa2624a0d51386422 (diff) | |
| download | chromium_src-de36240ae4c0ccec2d96b17e2390fd89b936e94d.zip chromium_src-de36240ae4c0ccec2d96b17e2390fd89b936e94d.tar.gz chromium_src-de36240ae4c0ccec2d96b17e2390fd89b936e94d.tar.bz2 | |
Implement alternative string conversion functions in net/ on Android,
using Java conversion functions. This is part of making it possible
to build net/ without ICU, to get binary size down when building net/
as a library
BUG=362608
Review URL: https://codereview.chromium.org/266053002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 559a7dc..a454e7d 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -438,6 +438,16 @@ ], }, ], + [ 'use_icu_alternatives_on_android == 1', { + 'sources!': [ + 'base/net_string_util_icu.cc', + ], + 'sources': [ + 'base/net_string_util_icu_alternatives_android.cc', + 'base/net_string_util_icu_alternatives_android.h', + ], + }, + ], ], 'target_conditions': [ # These source files are excluded by default platform rules, but they @@ -1430,6 +1440,14 @@ 'jni_generator_ptr_type': 'long', }, 'includes': [ '../build/jni_generator.gypi' ], + + 'conditions': [ + ['use_icu_alternatives_on_android==1', { + 'sources': [ + 'android/java/src/org/chromium/net/NetStringUtil.java', + ], + }], + ], }, { 'target_name': 'net_test_jni_headers', |