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

Unified Diff: trunk/src/ui/resources/ui_resources.gyp

Issue 387573003: Revert 282355 "Add chrome/browser/ui to the GN build." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/printing/BUILD.gn ('k') | trunk/src/ui/strings/ui_strings.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/resources/ui_resources.gyp
===================================================================
--- trunk/src/ui/resources/ui_resources.gyp (revision 282358)
+++ trunk/src/ui/resources/ui_resources.gyp (working copy)
@@ -9,7 +9,7 @@
'target_name': 'ui_resources',
'type': 'none',
'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/resources',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources',
},
'actions': [
{
@@ -53,9 +53,9 @@
'variables': {
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
],
'pak_output': '<(PRODUCT_DIR)/ui_test.pak',
},
@@ -69,7 +69,7 @@
# GN version //ui/resources:copy_ui_resources_100_percent
'destination': '<(PRODUCT_DIR)/ui',
'files': [
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
],
},
],
« no previous file with comments | « trunk/src/printing/BUILD.gn ('k') | trunk/src/ui/strings/ui_strings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698