Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2017 The Chromium Authors. All rights reserved. | 1 # Copyright 2017 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("//build/util/branding.gni") | 5 import("//build/util/branding.gni") |
| 6 import("//ui/vector_icons/vector_icons.gni") | 6 import("//ui/vector_icons/vector_icons.gni") |
| 7 | 7 |
| 8 aggregate_vector_icons("ui_vector_icons") { | 8 aggregate_vector_icons("ui_vector_icons") { |
| 9 icon_directory = "." | 9 icon_directory = "." |
| 10 | 10 |
| 11 icons = [ "info_outline.icon" ] | 11 icons = [ |
|
cjgrant
2017/05/05 16:32:22
I may split this out, as we need the lock, it come
mthiesse
2017/05/05 18:45:51
It doesn't if you rebase. I reverted my change.
cjgrant
2017/05/08 15:10:24
Done
| |
| 12 "info_outline.icon", | |
| 13 "back_arrow.1x.icon", | |
| 14 "back_arrow.icon", | |
| 15 "warning.icon", | |
| 16 ] | |
| 12 if (!is_android) { | 17 if (!is_android) { |
| 13 icons += [ | 18 icons += [ |
| 14 "back_arrow.1x.icon", | |
| 15 "back_arrow.icon", | |
| 16 "business.icon", | 19 "business.icon", |
| 17 "check_circle.icon", | 20 "check_circle.icon", |
| 18 "close.1x.icon", | 21 "close.1x.icon", |
| 19 "close.icon", | 22 "close.icon", |
| 20 "error_circle.icon", | 23 "error_circle.icon", |
| 21 "forward_arrow.1x.icon", | 24 "forward_arrow.1x.icon", |
| 22 "forward_arrow.icon", | 25 "forward_arrow.icon", |
| 23 "location_on.icon", | 26 "location_on.icon", |
| 24 "media_router_active.icon", | 27 "media_router_active.icon", |
| 25 "media_router_error.icon", | 28 "media_router_error.icon", |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 40 static_library("vector_icons") { | 43 static_library("vector_icons") { |
| 41 sources = get_target_outputs(":ui_vector_icons") | 44 sources = get_target_outputs(":ui_vector_icons") |
| 42 sources += [ "//ui/gfx/vector_icon_types.h" ] | 45 sources += [ "//ui/gfx/vector_icon_types.h" ] |
| 43 | 46 |
| 44 deps = [ | 47 deps = [ |
| 45 ":ui_vector_icons", | 48 ":ui_vector_icons", |
| 46 "//base", | 49 "//base", |
| 47 "//skia", | 50 "//skia", |
| 48 ] | 51 ] |
| 49 } | 52 } |
| OLD | NEW |