summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 09:24:43 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 09:24:43 +0000
commitdef1c0f59e95cf69eb64e72570bdad96e69feb24 (patch)
tree5db66ec204b468fabbb96e825227d7ddea0b3352
parentad9c88f73cc7dca4cd32bdc3d448a116e56827e7 (diff)
downloadchromium_src-def1c0f59e95cf69eb64e72570bdad96e69feb24.zip
chromium_src-def1c0f59e95cf69eb64e72570bdad96e69feb24.tar.gz
chromium_src-def1c0f59e95cf69eb64e72570bdad96e69feb24.tar.bz2
Remove chrome.pak and its references.
chromite was updated to no longer install chrome.pak in https://gerrit.chromium.org/gerrit/66855 (Aug 2013) and that version was into chrome already so it should be good to delete it now. BUG=52609 TEST=None R=thakis@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/189763002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255567 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_repack_chrome.gypi21
-rw-r--r--chrome/chrome_resources.gyp3
2 files changed, 0 insertions, 24 deletions
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
deleted file mode 100644
index 760feda..0000000
--- a/chrome/chrome_repack_chrome.gypi
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2012 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.
-{
- # This file is an unused, a mostly empty placeholder which should go away
- # eventually -- http://crbug.com/52609
- 'action_name': 'repack_chrome',
- 'variables': {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
- ],
- },
- 'inputs': [
- '<(repack_path)',
- '<@(pak_inputs)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
- ],
- 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-}
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index d6c32d0..bbb2c4071 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -367,9 +367,6 @@
],
'actions': [
{
- 'includes': ['chrome_repack_chrome.gypi']
- },
- {
'includes': ['chrome_repack_locales.gypi']
},
{