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

Unified Diff: chrome/chrome_resources.gyp

Issue 216013003: Clean up repack.py and repack_locale.py usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index f67bfb4d64a10059e5d0946bff5288267e9cd6ad..6b1d8d86b804bd2a74ba2d1e9c64aae45021a2b1 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -6,7 +6,6 @@
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
- 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
},
'targets': [
{
@@ -320,9 +319,6 @@
{
'target_name': 'packed_extra_resources',
'type': 'none',
- 'variables': {
- 'repack_path': '../tools/grit/grit/format/repack.py',
- },
'dependencies': [
'chrome_extra_resources',
'packed_resources',
@@ -350,9 +346,6 @@
{
'target_name': 'packed_resources',
'type': 'none',
- 'variables': {
- 'repack_path': '../tools/grit/grit/format/repack.py',
- },
'dependencies': [
# MSVS needs the dependencies explictly named, Make is able to
# derive the dependencies from the output files.
@@ -367,10 +360,18 @@
],
'actions': [
{
+ 'action_name': 'repack_locales_pack',
+ 'variables': {
+ 'pak_locales': '<(locales)',
+ },
'includes': ['chrome_repack_locales.gypi']
},
{
- 'includes': ['chrome_repack_pseudo_locales.gypi']
+ 'action_name': 'repack_pseudo_locales_pack',
+ 'variables': {
+ 'pak_locales': '<(pseudo_locales)',
+ },
+ 'includes': ['chrome_repack_locales.gypi']
},
{
'includes': ['chrome_repack_chrome_100_percent.gypi']

Powered by Google App Engine
This is Rietveld 408576698