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

Side by Side Diff: url/url.gyp

Issue 719783005: Upstream "nsurl_util.{h,mm}" from Chrome on iOS repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments from droger. Created 6 years, 1 month 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
« no previous file with comments | « url/mac/url_conversions_unittest.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 ['use_icu_alternatives_on_android==1 and OS=="android"', { 47 ['use_icu_alternatives_on_android==1 and OS=="android"', {
48 'dependencies': [ 48 'dependencies': [
49 'url_java', 49 'url_java',
50 'url_jni_headers', 50 'url_jni_headers',
51 ], 51 ],
52 'sources': [ 52 'sources': [
53 'url_canon_icu_alternatives_android.cc', 53 'url_canon_icu_alternatives_android.cc',
54 'url_canon_icu_alternatives_android.h', 54 'url_canon_icu_alternatives_android.h',
55 ], 55 ],
56 }], 56 }],
57 ['OS=="mac" or OS=="ios"', {
58 'sources': [
59 'mac/url_conversions.h',
60 'mac/url_conversions.mm',
61 ],
62 }],
57 ], 63 ],
58 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 64 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
59 'msvs_disabled_warnings': [4267, ], 65 'msvs_disabled_warnings': [4267, ],
60 }, 66 },
61 { 67 {
62 'target_name': 'url_unittests', 68 'target_name': 'url_unittests',
63 'type': 'executable', 69 'type': 'executable',
64 'dependencies': [ 70 'dependencies': [
65 '../base/base.gyp:run_all_unittests', 71 '../base/base.gyp:run_all_unittests',
66 '../testing/gtest.gyp:gtest', 72 '../testing/gtest.gyp:gtest',
(...skipping 20 matching lines...) Expand all
87 ['use_icu_alternatives_on_android==1', 93 ['use_icu_alternatives_on_android==1',
88 { 94 {
89 'sources!': [ 95 'sources!': [
90 'url_canon_icu_unittest.cc', 96 'url_canon_icu_unittest.cc',
91 ], 97 ],
92 'dependencies!': [ 98 'dependencies!': [
93 '../third_party/icu/icu.gyp:icuuc', 99 '../third_party/icu/icu.gyp:icuuc',
94 ], 100 ],
95 } 101 }
96 ], 102 ],
103 ['OS=="mac" or OS=="ios"', {
104 'sources': [
105 'mac/url_conversions_unittest.mm',
106 ],
107 }],
97 ], 108 ],
98 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 109 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
99 'msvs_disabled_warnings': [4267, ], 110 'msvs_disabled_warnings': [4267, ],
100 }, 111 },
101 ], 112 ],
102 'conditions': [ 113 'conditions': [
103 ['use_icu_alternatives_on_android==1 and OS=="android"', { 114 ['use_icu_alternatives_on_android==1 and OS=="android"', {
104 'targets': [ 115 'targets': [
105 { 116 {
106 'target_name': 'url_jni_headers', 117 'target_name': 'url_jni_headers',
(...skipping 14 matching lines...) Expand all
121 }, 132 },
122 'dependencies': [ 133 'dependencies': [
123 '../base/base.gyp:base', 134 '../base/base.gyp:base',
124 ], 135 ],
125 'includes': [ '../build/java.gypi' ], 136 'includes': [ '../build/java.gypi' ],
126 }, 137 },
127 ], 138 ],
128 }], 139 }],
129 ], 140 ],
130 } 141 }
OLDNEW
« no previous file with comments | « url/mac/url_conversions_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698