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

Side by Side Diff: BUILD.gn

Issue 2029803003: Update to Chromium //url at Chromium commit 79dc59ac7602413181079ecb463873e29a1d7d0a. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/domokit/gurl@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | android/java/src/org/chromium/url/IDNStringUtil.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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("//testing/test.gni") 5 import("//testing/test.gni")
6 import("//url/config.gni") 6 import("//url/config.gni")
7 7
8 # Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag. 8 # Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag.
9 config("url_icu_config") { 9 config("url_icu_config") {
10 if (use_icu_alternatives_on_android) { 10 if (use_icu_alternatives_on_android) {
11 defines = [ "USE_ICU_ALTERNATIVES_ON_ANDROID=1" ] 11 defines = [ "USE_ICU_ALTERNATIVES_ON_ANDROID=1" ]
12 } 12 }
13 } 13 }
14 14
15 component("url") { 15 component("url") {
16 if (is_win) { 16 if (is_win) {
17 # Don't conflict with Windows' "url.dll". 17 # Don't conflict with Windows' "url.dll".
18 output_name = "url_lib" 18 output_name = "url_lib"
19 } 19 }
20 sources = [ 20 sources = [
21 "android/url_jni_registrar.cc", 21 "android/url_jni_registrar.cc",
22 "android/url_jni_registrar.h", 22 "android/url_jni_registrar.h",
23 "gurl.cc", 23 "gurl.cc",
24 "gurl.h", 24 "gurl.h",
25 "origin.cc", 25 "origin.cc",
26 "origin.h", 26 "origin.h",
27 "scheme_host_port.cc",
28 "scheme_host_port.h",
27 "third_party/mozilla/url_parse.cc", 29 "third_party/mozilla/url_parse.cc",
28 "third_party/mozilla/url_parse.h", 30 "third_party/mozilla/url_parse.h",
29 "url_canon.h", 31 "url_canon.h",
30 "url_canon_etc.cc", 32 "url_canon_etc.cc",
31 "url_canon_filesystemurl.cc", 33 "url_canon_filesystemurl.cc",
32 "url_canon_fileurl.cc", 34 "url_canon_fileurl.cc",
33 "url_canon_host.cc", 35 "url_canon_host.cc",
34 "url_canon_icu.cc", 36 "url_canon_icu.cc",
35 "url_canon_icu.h", 37 "url_canon_icu.h",
36 "url_canon_internal.cc", 38 "url_canon_internal.cc",
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 86
85 sources += [ 87 sources += [
86 "url_canon_icu_alternatives_android.cc", 88 "url_canon_icu_alternatives_android.cc",
87 "url_canon_icu_alternatives_android.h", 89 "url_canon_icu_alternatives_android.h",
88 ] 90 ]
89 } 91 }
90 } 92 }
91 93
92 # TODO(dpranke): crbug.com/360936. Get this to build and run on Android. 94 # TODO(dpranke): crbug.com/360936. Get this to build and run on Android.
93 if (!is_android) { 95 if (!is_android) {
96 # TODO(GYP): Delete this after we've converted everything to GN.
97 # The _run targets exist only for compatibility w/ GYP.
98 group("url_unittests_run") {
99 testonly = true
100 deps = [
101 ":url_unittests",
102 ]
103 }
104
94 test("url_unittests") { 105 test("url_unittests") {
95 sources = [ 106 sources = [
96 "gurl_unittest.cc", 107 "gurl_unittest.cc",
97 "origin_unittest.cc", 108 "origin_unittest.cc",
109 "scheme_host_port_unittest.cc",
98 "url_canon_icu_unittest.cc", 110 "url_canon_icu_unittest.cc",
99 "url_canon_unittest.cc", 111 "url_canon_unittest.cc",
100 "url_parse_unittest.cc", 112 "url_parse_unittest.cc",
101 "url_test_utils.h", 113 "url_test_utils.h",
102 "url_util_unittest.cc", 114 "url_util_unittest.cc",
103 ] 115 ]
104 116
105 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 117 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
106 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 118 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
107 119
(...skipping 10 matching lines...) Expand all
118 "//testing/gtest", 130 "//testing/gtest",
119 "//third_party/icu:icuuc", 131 "//third_party/icu:icuuc",
120 ] 132 ]
121 133
122 if (use_icu_alternatives_on_android) { 134 if (use_icu_alternatives_on_android) {
123 sources -= [ "url_canon_icu_unittest.cc" ] 135 sources -= [ "url_canon_icu_unittest.cc" ]
124 deps -= [ "//third_party/icu:icuuc" ] 136 deps -= [ "//third_party/icu:icuuc" ]
125 } 137 }
126 } 138 }
127 } 139 }
OLDNEW
« no previous file with comments | « no previous file | android/java/src/org/chromium/url/IDNStringUtil.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698