diff options
Diffstat (limited to 'url/url.gyp')
| -rw-r--r-- | url/url.gyp | 62 |
1 files changed, 61 insertions, 1 deletions
diff --git a/url/url.gyp b/url/url.gyp index 93bbee2..d1c3bf1 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -33,6 +33,28 @@ 'defines': [ 'URL_IMPLEMENTATION', ], + 'conditions': [ + ['use_icu_alternatives_on_android==1', { + 'sources!': [ + 'url_canon_icu.cc', + 'url_canon_icu.h', + ], + 'dependencies!': [ + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', + ], + }], + ['use_icu_alternatives_on_android==1 and OS=="android"', { + 'dependencies': [ + 'url_java', + 'url_jni_headers', + ], + 'sources': [ + 'url_canon_icu_alternatives_android.cc', + 'url_canon_icu_alternatives_android.h', + ], + }], + ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, @@ -40,7 +62,6 @@ 'target_name': 'url_unittests', 'type': 'executable', 'dependencies': [ - '../base/base.gyp:base_i18n', '../base/base.gyp:run_all_unittests', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icuuc', @@ -49,6 +70,7 @@ 'sources': [ 'gurl_unittest.cc', 'origin_unittest.cc', + 'url_canon_icu_unittest.cc', 'url_canon_unittest.cc', 'url_parse_unittest.cc', 'url_test_utils.h', @@ -63,9 +85,47 @@ ], } ], + ['use_icu_alternatives_on_android==1', + { + 'sources!': [ + 'url_canon_icu_unittest.cc', + ], + 'dependencies!': [ + '../third_party/icu/icu.gyp:icuuc', + ], + } + ], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, ], + 'conditions': [ + ['use_icu_alternatives_on_android==1 and OS=="android"', { + 'targets': [ + { + 'target_name': 'url_jni_headers', + 'type': 'none', + 'sources': [ + 'android/java/src/org/chromium/url/IDNStringUtil.java' + ], + 'variables': { + 'jni_gen_package': 'url', + }, + 'includes': [ '../build/jni_generator.gypi' ], + }, + { + 'target_name': 'url_java', + 'type': 'none', + 'variables': { + 'java_in_dir': '../url/android/java', + }, + 'dependencies': [ + '../base/base.gyp:base', + ], + 'includes': [ '../build/java.gypi' ], + }, + ], + }], + ], } |