Chromium Code Reviews| Index: components/url_formatter/BUILD.gn |
| diff --git a/components/url_formatter/BUILD.gn b/components/url_formatter/BUILD.gn |
| index 3b777de5fa02551584b4b415a5fc1c234a3d09b6..507ec091dd8e1bbdc1550bb08538c7e5b1330d0d 100644 |
| --- a/components/url_formatter/BUILD.gn |
| +++ b/components/url_formatter/BUILD.gn |
| @@ -1,6 +1,7 @@ |
| # Copyright 2015 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| +import("//build/config/ui.gni") |
|
msw
2015/11/03 23:55:33
nit: add a blank line above.
bshe
2015/11/04 14:38:00
Done.
|
| source_set("url_formatter") { |
| sources = [ |
| @@ -19,11 +20,12 @@ source_set("url_formatter") { |
| "//base", |
| "//third_party/icu", |
| "//net", |
| + "//ui/gfx", |
| "//url", |
| ] |
| - if (!is_android) { |
| - deps += [ "//ui/gfx" ] |
| + if (is_android && !use_aura) { |
|
msw
2015/11/03 23:55:33
Consider: if (!is_android || use_aura) { deps += [
bshe
2015/11/04 14:38:01
Done.
|
| + deps -= [ "//ui/gfx" ] |
|
msw
2015/11/03 23:55:33
Shouldn't the GYP file have corresponding changes?
bshe
2015/11/04 14:38:00
For aura Android, we will only support gn build. T
msw
2015/11/04 19:16:11
Hmm, it's a gray area, I's update GYP too, but it
bshe
2015/11/04 22:38:21
Right. Updated GYP file since it is pretty trivial
|
| } |
| } |
| @@ -44,7 +46,7 @@ source_set("unit_tests") { |
| "//url", |
| ] |
| - if (is_android) { |
| + if (is_android && !use_aura) { |
| deps -= [ "//ui/gfx" ] |
| } |
| } |