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

Unified Diff: ui/resources/ui_resources.gyp

Issue 381463002: Add chrome/browser/ui to the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add %$&*ing missing comma 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 | « printing/BUILD.gn ('k') | ui/strings/ui_strings.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/resources/ui_resources.gyp
diff --git a/ui/resources/ui_resources.gyp b/ui/resources/ui_resources.gyp
index 427870fbe259245198d44eb11ceea6cc0588f29e..7f97865c7338b2f5bce203089632a1a59a6db0ee 100644
--- a/ui/resources/ui_resources.gyp
+++ b/ui/resources/ui_resources.gyp
@@ -9,7 +9,7 @@
'target_name': 'ui_resources',
'type': 'none',
'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/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/ui_resources/ui_resources_100_percent.pak',
tfarina 2014/07/10 16:44:34 that was my plan, to fix those paths. Thanks for d
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_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',
],
'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/ui_resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
],
},
],
« no previous file with comments | « printing/BUILD.gn ('k') | ui/strings/ui_strings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698