From dc8e94bd41b5a9f19a2160510c74edacce2fa1c7 Mon Sep 17 00:00:00 2001
From: mef <mef@chromium.org>
Date: Wed, 11 Mar 2015 12:49:05 -0700
Subject: Cronet depends on url/ and net/ compiled with special flag
'USE_ICU_ALTERNATIVES_ON_ANDROID'.
That requires either a separate set of build bots, OR making separate targets for url/ and net/ that use that flag.
This change adds such targets (extracting net target into separate net_common.gypi).
BUG=430500
Review URL: https://codereview.chromium.org/933293003
Cr-Commit-Position: refs/heads/master@{#320126}
---
url/url.gyp | 63 +++++++++++++++++++++++++++++--------------------------------
1 file changed, 30 insertions(+), 33 deletions(-)
(limited to 'url')
diff --git a/url/url.gyp b/url/url.gyp
index 0ffc51a..4114801 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -33,28 +33,6 @@
'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, ],
},
@@ -84,23 +62,13 @@
],
}
],
- ['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"', {
+ ['OS=="android"', {
'targets': [
{
'target_name': 'url_jni_headers',
@@ -124,6 +92,35 @@
],
'includes': [ '../build/java.gypi' ],
},
+ {
+ # Same as url_lib but using ICU alternatives on Android.
+ 'target_name': 'url_lib_use_icu_alternatives_on_android',
+ 'type': '<(component)',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ 'url_java',
+ 'url_jni_headers',
+ ],
+ 'sources': [
+ '<@(gurl_sources)',
+ 'url_canon_icu_alternatives_android.cc',
+ 'url_canon_icu_alternatives_android.h',
+ ],
+ 'sources!': [
+ 'url_canon_icu.cc',
+ 'url_canon_icu.h',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '..',
+ ],
+ },
+ 'defines': [
+ 'URL_IMPLEMENTATION',
+ 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
+ ],
+ },
],
}],
],
--
cgit v1.1