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

Side by Side Diff: url/url.gyp

Issue 257673002: Make it possible to build url/ without ICU on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix GN/GYP Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'url_srcs.gypi', 10 'url_srcs.gypi',
(...skipping 15 matching lines...) Expand all
26 '<@(gurl_sources)', 26 '<@(gurl_sources)',
27 ], 27 ],
28 'direct_dependent_settings': { 28 'direct_dependent_settings': {
29 'include_dirs': [ 29 'include_dirs': [
30 '..', 30 '..',
31 ], 31 ],
32 }, 32 },
33 'defines': [ 33 'defines': [
34 'URL_IMPLEMENTATION', 34 'URL_IMPLEMENTATION',
35 ], 35 ],
36 'conditions': [
37 ['use_icu_alternatives == 1', {
38 'sources!': [
39 'url_canon_icu.cc',
40 'url_canon_icu.h',
41 ],
42 'dependencies!': [
43 '../third_party/icu/icu.gyp:icui18n',
44 '../third_party/icu/icu.gyp:icuuc',
45 ],
46 }],
47 ['OS == "android" and use_icu_alternatives == 1', {
48 'dependencies': [
49 'url_java',
50 'url_jni_headers',
51 ],
52 'sources': [
53 'url_canon_icu_alternatives_android.cc',
54 'url_canon_icu_alternatives_android.h',
55 ],
56 }],
57 ],
36 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 58 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
37 'msvs_disabled_warnings': [4267, ], 59 'msvs_disabled_warnings': [4267, ],
38 }, 60 },
39 { 61 {
40 'target_name': 'url_unittests', 62 'target_name': 'url_unittests',
41 'type': 'executable', 63 'type': 'executable',
42 'dependencies': [ 64 'dependencies': [
43 '../base/base.gyp:base_i18n', 65 '../base/base.gyp:base_i18n',
44 '../base/base.gyp:run_all_unittests', 66 '../base/base.gyp:run_all_unittests',
45 '../testing/gtest.gyp:gtest', 67 '../testing/gtest.gyp:gtest',
46 '../third_party/icu/icu.gyp:icuuc', 68 '../third_party/icu/icu.gyp:icuuc',
47 'url_lib', 69 'url_lib',
48 ], 70 ],
49 'sources': [ 71 'sources': [
50 'gurl_unittest.cc', 72 'gurl_unittest.cc',
51 'origin_unittest.cc', 73 'origin_unittest.cc',
74 'url_canon_icu_unittest.cc',
52 'url_canon_unittest.cc', 75 'url_canon_unittest.cc',
53 'url_parse_unittest.cc', 76 'url_parse_unittest.cc',
54 'url_test_utils.h', 77 'url_test_utils.h',
55 'url_util_unittest.cc', 78 'url_util_unittest.cc',
56 ], 79 ],
57 'conditions': [ 80 'conditions': [
58 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 81 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
59 ['os_posix==1 and OS!="mac" and OS!="ios" and ((use_allocator!="none" an d use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and l inux_use_tcmalloc==1))', 82 ['os_posix==1 and OS!="mac" and OS!="ios" and ((use_allocator!="none" an d use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and l inux_use_tcmalloc==1))',
60 { 83 {
61 'dependencies': [ 84 'dependencies': [
62 '../base/allocator/allocator.gyp:allocator', 85 '../base/allocator/allocator.gyp:allocator',
63 ], 86 ],
64 } 87 }
65 ], 88 ],
89 ['use_icu_alternatives == 1',
90 {
91 'sources!': [
92 'url_canon_icu_unittest.cc',
93 ],
94 'dependencies!': [
95 '../base/base.gyp:base_i18n',
96 '../third_party/icu/icu.gyp:icuuc',
97 ],
98 }
99 ],
66 ], 100 ],
67 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 101 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
68 'msvs_disabled_warnings': [4267, ], 102 'msvs_disabled_warnings': [4267, ],
69 }, 103 },
70 ], 104 ],
105 'conditions': [
106 ['use_icu_alternatives == 1', {
mef 2014/05/01 19:45:15 maybe add [and OS == "android"] ?
mmenke 2014/05/01 21:01:33 Nice catch, done! Think it's kinda weird things d
mef 2014/05/02 15:10:48 On 2014/05/01 21:01:33, mmenke wrote: > On 2014/05
mmenke 2014/05/02 15:30:48 You're right - realized that after I made the comm
107 'targets': [
108 {
109 'target_name': 'url_jni_headers',
110 'type': 'none',
111 'sources': [
112 'android/java/src/org/chromium/url/IDNStringUtil.java'
113 ],
114 'variables': {
115 'jni_gen_package': 'url',
116 },
117 'includes': [ '../build/jni_generator.gypi' ],
118 },
119 {
120 'target_name': 'url_java',
121 'type': 'none',
122 'variables': {
123 'java_in_dir': '../url/android/java',
124 },
125 'dependencies': [
126 '../base/base.gyp:base',
127 ],
128 'includes': [ '../build/java.gypi' ],
129 },
130 ],
131 }],
132 ],
71 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698