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

Side by Side Diff: url/BUILD.gn

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: Updated files to reflect upstreaming. Diff against patch set 3. 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import("//url/config.gni") 5 import("//url/config.gni")
6 6
7 # Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag. 7 # Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag.
8 config("url_icu_config") { 8 config("url_icu_config") {
9 if (use_icu_alternatives_on_android) { 9 if (use_icu_alternatives_on_android) {
10 defines = [ "USE_ICU_ALTERNATIVES_ON_ANDROID=1" ] 10 defines = [ "USE_ICU_ALTERNATIVES_ON_ANDROID=1" ]
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 deps -= [ 80 deps -= [
81 "//third_party/icu:icudata", 81 "//third_party/icu:icudata",
82 "//third_party/icu", 82 "//third_party/icu",
83 ] 83 ]
84 84
85 sources += [ 85 sources += [
86 "url_canon_icu_alternatives_android.cc", 86 "url_canon_icu_alternatives_android.cc",
87 "url_canon_icu_alternatives_android.h", 87 "url_canon_icu_alternatives_android.h",
88 ] 88 ]
89 } 89 }
90
91 if (is_mac || is_ios) {
92 sources += [
93 "mac/url_conversions.h",
94 "mac/url_conversions.mm",
95 ]
96 }
90 } 97 }
91 98
92 # TODO(dpranke): crbug.com/360936. Get this to build and run on Android. 99 # TODO(dpranke): crbug.com/360936. Get this to build and run on Android.
93 if (!is_android) { 100 if (!is_android) {
94 test("url_unittests") { 101 test("url_unittests") {
95 sources = [ 102 sources = [
96 "gurl_unittest.cc", 103 "gurl_unittest.cc",
97 "origin_unittest.cc", 104 "origin_unittest.cc",
98 "url_canon_icu_unittest.cc", 105 "url_canon_icu_unittest.cc",
99 "url_canon_unittest.cc", 106 "url_canon_unittest.cc",
(...skipping 23 matching lines...) Expand all
123 ] 130 ]
124 131
125 if (use_icu_alternatives_on_android) { 132 if (use_icu_alternatives_on_android) {
126 sources -= [ 133 sources -= [
127 "url_canon_icu_unittest.cc", 134 "url_canon_icu_unittest.cc",
128 ] 135 ]
129 deps -= [ 136 deps -= [
130 "//third_party/icu:icuuc", 137 "//third_party/icu:icuuc",
131 ] 138 ]
132 } 139 }
140
141 if (is_mac || is_ios) {
142 sources += [
143 "mac/url_conversions_unittest.mm",
144 ]
145 }
133 } 146 }
134 } 147 }
OLDNEW
« no previous file with comments | « base/mac/sdk_forward_declarations.h ('k') | url/mac/README » ('j') | url/mac/url_conversions.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698