summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_repack_pseudo_locales.gypi
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 15:32:12 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 15:32:12 +0000
commitadf6b2e17687fc42a548898fb27347e74cb73918 (patch)
treeefaab552c4d80d620d29eb8b1573b239d0de03f4 /chrome/chrome_repack_pseudo_locales.gypi
parentd0a37403abc06875bdcd7ea058891dc210867906 (diff)
downloadchromium_src-adf6b2e17687fc42a548898fb27347e74cb73918.zip
chromium_src-adf6b2e17687fc42a548898fb27347e74cb73918.tar.gz
chromium_src-adf6b2e17687fc42a548898fb27347e74cb73918.tar.bz2
Revert 108466 - Introduces chromium_resources.gyp to factor out Chrome resource generation
1. Factors out Chrome/Chromium resource generation into a separate chrome_resources.gyp file. 2. Eliminates repetition between Mac and other platforms. 3. Breaks long "repack" actions out into separate files for greater readability. 4. Eliminates circular dependencies in the Aura shell, the Views components, and the compositor when utilizing Chrome resources. BUG=none TEST=try bots run gyps and build correctly. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107967 Review URL: http://codereview.chromium.org/8425002 TBR=dhollowa@chromium.org Review URL: http://codereview.chromium.org/8448001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_pseudo_locales.gypi')
-rw-r--r--chrome/chrome_repack_pseudo_locales.gypi38
1 files changed, 0 insertions, 38 deletions
diff --git a/chrome/chrome_repack_pseudo_locales.gypi b/chrome/chrome_repack_pseudo_locales.gypi
deleted file mode 100644
index 2f1105a..0000000
--- a/chrome/chrome_repack_pseudo_locales.gypi
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
- 'action_name': 'repack_pseudo_locales',
- 'variables': {
- 'conditions': [
- ['branding=="Chrome"', {
- 'branding_flag': ['-b', 'google_chrome',],
- }, { # else: branding!="Chrome"
- 'branding_flag': ['-b', 'chromium',],
- }],
- ]
- },
- 'inputs': [
- 'tools/build/repack_locales.py',
- '<!@pymod_do_main(repack_locales -i <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))'
- ],
- 'conditions': [
- ['OS == "mac"', {
- 'outputs': [
- '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pseudo_locales))'
- ],
- }, { # else 'OS != "mac"'
- 'outputs': [
- '<(INTERMEDIATE_DIR)/<(pseudo_locales).pak'
- ],
- }],
- ],
- 'action': [
- '<@(repack_locales_cmd)',
- '<@(branding_flag)',
- '-g', '<(grit_out_dir)',
- '-s', '<(SHARED_INTERMEDIATE_DIR)',
- '-x', '<(SHARED_INTERMEDIATE_DIR)/.',
- '<@(pseudo_locales)',
- ],
-}