forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This CL updates chrome/chrome_resources.gyp to generate the chrome_300_percent.pak file (via the newly-added chrome/chrome_repack_chrome_300_percent.gypi). Several .grd files have been updated to generate the *_300_percent.pak files that are used to create chrome_300_percent.pak. This CL doesn't add any assets but grit complains if the necessary default_300_percent directories are not present so this CL adds placeholder files in these directories until real assets are added (which is tracked by crbug.com/423755). Since there are no assets in the *_300_percent directories, grit will fallback to using the 1x versions when generating the *_300_percent.pak files. Note that 300 percent support will be enabled in ui/base/resources by a subsequent CL (https://chromiumcodereview.appspot.com/646773004/). BUG=423762 Review URL: https://codereview.chromium.org/633373010 Cr-Commit-Position: refs/heads/master@{#300869}
- Loading branch information
lliabraa
authored and
Commit bot
committed
Oct 23, 2014
1 parent
14b90d5
commit ca09c95
Showing
11 changed files
with
35 additions
and
0 deletions.
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# 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. | ||
{ | ||
# GN version: //chrome:repack_chrome_300_percent | ||
'action_name': 'repack_chrome_resources_300_percent', | ||
'variables': { | ||
'pak_inputs': [ | ||
# Only iOS generates 300 percent pak files so the inputs will need to be | ||
# updated if other platforms need 300 percent support. | ||
'<(SHARED_INTERMEDIATE_DIR)/components/components_resources_300_percent.pak', | ||
'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_300_percent.pak', | ||
# TODO(ios): Remove the dependency on renderer_resources. | ||
'<(grit_out_dir)/renderer_resources_300_percent.pak', | ||
'<(grit_out_dir)/theme_resources_300_percent.pak', | ||
], | ||
'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_300_percent.pak', | ||
}, | ||
'includes': [ '../build/repack_action.gypi' ], | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters