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

Side by Side Diff: url/BUILD.gn

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to #317924 Created 5 years, 9 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
« third_party/harfbuzz-ng/BUILD.gn ('K') | « ui/events/BUILD.gn ('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 (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) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 "url_parse_file.cc", 53 "url_parse_file.cc",
54 "url_parse_internal.h", 54 "url_parse_internal.h",
55 "url_util.cc", 55 "url_util.cc",
56 "url_util.h", 56 "url_util.h",
57 ] 57 ]
58 58
59 defines = [ "URL_IMPLEMENTATION" ] 59 defines = [ "URL_IMPLEMENTATION" ]
60 60
61 configs += [ 61 configs += [
62 ":url_icu_config", 62 ":url_icu_config",
63
63 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 64 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
64 "//build/config/compiler:no_size_t_to_int_warning", 65 "//build/config/compiler:no_size_t_to_int_warning",
65 ] 66 ]
66 67
67 deps = [ 68 deps = [
68 "//base", 69 "//base",
69 "//base/third_party/dynamic_annotations",
70 "//third_party/icu:icudata", 70 "//third_party/icu:icudata",
71 "//third_party/icu", 71 "//third_party/icu",
72 ] 72 ]
73 73
74 if (!is_nacl) {
75 deps += [ "//base/third_party/dynamic_annotations" ]
76 }
77
74 if (use_icu_alternatives_on_android) { 78 if (use_icu_alternatives_on_android) {
75 sources -= [ 79 sources -= [
76 "url_canon_icu.cc", 80 "url_canon_icu.cc",
77 "url_canon_icu.h", 81 "url_canon_icu.h",
78 ] 82 ]
79 deps -= [ 83 deps -= [
80 "//third_party/icu:icudata", 84 "//third_party/icu:icudata",
81 "//third_party/icu", 85 "//third_party/icu",
82 ] 86 ]
83 87
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 "//testing/gtest", 121 "//testing/gtest",
118 "//third_party/icu:icuuc", 122 "//third_party/icu:icuuc",
119 ] 123 ]
120 124
121 if (use_icu_alternatives_on_android) { 125 if (use_icu_alternatives_on_android) {
122 sources -= [ "url_canon_icu_unittest.cc" ] 126 sources -= [ "url_canon_icu_unittest.cc" ]
123 deps -= [ "//third_party/icu:icuuc" ] 127 deps -= [ "//third_party/icu:icuuc" ]
124 } 128 }
125 } 129 }
126 } 130 }
OLDNEW
« third_party/harfbuzz-ng/BUILD.gn ('K') | « ui/events/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698