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

Unified Diff: ui/gfx/gfx.gyp

Issue 1231843002: Revert of Revert vector icon CLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@merge_aide_oobe_completion
Patch Set: Rebase. Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/BUILD.gn ('k') | ui/gfx/paint_vector_icon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gfx.gyp
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 11c1ba624d3e6c01f0240d15c5e4073c900de9db..8dc8c76d615ce3e3f5c760a93748e75a93b2c5dc 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -94,7 +94,7 @@
'GFX_IMPLEMENTATION',
],
'include_dirs': [
- '<(DEPTH)/third_party/icu/source/common'
+ '<(DEPTH)/third_party/icu/source/common',
],
'sources': [
'android/device_display_info.cc',
@@ -405,6 +405,42 @@
'render_text_harfbuzz.h',
'text_utils_skia.cc',
],
+ }, { # desktop platforms
+ 'variables': {
+ 'vector_icons_cc_file': '<(INTERMEDIATE_DIR)/ui/gfx/vector_icons.cc',
+ 'vector_icons_public_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/vector_icons_public.h',
+ },
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)>',
+ ],
+ 'sources': [
+ '<(vector_icons_cc_file)',
+ '<(vector_icons_public_h_file)',
+
+ 'paint_vector_icon.cc',
+ 'paint_vector_icon.h',
+ 'vector_icons.h',
+ ],
+ 'actions': [
+ {
+ # GN version: //ui/gfx:aggregate_vector_icons
+ 'action_name': 'aggregate_vector_icons',
+ 'inputs': [
+ 'vector_icons/',
+ ],
+ 'outputs': [
+ '<(vector_icons_cc_file)',
+ '<(vector_icons_public_h_file)',
+ ],
+ 'action': [ 'python',
+ 'vector_icons/aggregate_vector_icons.py',
+ '--working_directory=vector_icons/',
+ '--output_cc=<(vector_icons_cc_file)',
+ '--output_h=<(vector_icons_public_h_file)',
+ ],
+ 'message': 'Aggregating vector resources.',
+ },
+ ],
}],
['use_x11==1', {
'dependencies': [
« no previous file with comments | « ui/gfx/BUILD.gn ('k') | ui/gfx/paint_vector_icon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698