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

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: clean up for review Created 5 years, 10 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 defines = [ "URL_IMPLEMENTATION" ] 59 defines = [ "URL_IMPLEMENTATION" ]
60 60
61 configs += [ ":url_icu_config" ] 61 configs += [ ":url_icu_config" ]
62 62
63 if (is_win) { 63 if (is_win) {
64 cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int t runcations. 64 cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int t runcations.
65 } 65 }
66 66
67 deps = [ 67 deps = [
68 "//base", 68 "//base",
69 "//base/third_party/dynamic_annotations",
70 "//third_party/icu:icudata", 69 "//third_party/icu:icudata",
71 "//third_party/icu", 70 "//third_party/icu",
72 ] 71 ]
73 72
73 if (!is_nacl) {
74 deps += [ "//base/third_party/dynamic_annotations" ]
75 }
76
74 if (use_icu_alternatives_on_android) { 77 if (use_icu_alternatives_on_android) {
75 sources -= [ 78 sources -= [
76 "url_canon_icu.cc", 79 "url_canon_icu.cc",
77 "url_canon_icu.h", 80 "url_canon_icu.h",
78 ] 81 ]
79 deps -= [ 82 deps -= [
80 "//third_party/icu:icudata", 83 "//third_party/icu:icudata",
81 "//third_party/icu", 84 "//third_party/icu",
82 ] 85 ]
83 86
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 "//testing/gtest", 124 "//testing/gtest",
122 "//third_party/icu:icuuc", 125 "//third_party/icu:icuuc",
123 ] 126 ]
124 127
125 if (use_icu_alternatives_on_android) { 128 if (use_icu_alternatives_on_android) {
126 sources -= [ "url_canon_icu_unittest.cc" ] 129 sources -= [ "url_canon_icu_unittest.cc" ]
127 deps -= [ "//third_party/icu:icuuc" ] 130 deps -= [ "//third_party/icu:icuuc" ]
128 } 131 }
129 } 132 }
130 } 133 }
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