diff options
| author | vitalyp <vitalyp@chromium.org> | 2014-10-02 20:29:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 03:29:20 +0000 |
| commit | 1fbb765ec9959bb63363f5c3d1f412c0d06dcf50 (patch) | |
| tree | ea00120ce7f2f09f41db2e3d9757ea3a91f18aa5 /third_party | |
| parent | e3cc6ed52f3a06a5d5a2bcb102eb0ae667870fbe (diff) | |
| download | chromium_src-1fbb765ec9959bb63363f5c3d1f412c0d06dcf50.zip chromium_src-1fbb765ec9959bb63363f5c3d1f412c0d06dcf50.tar.gz chromium_src-1fbb765ec9959bb63363f5c3d1f412c0d06dcf50.tar.bz2 | |
Add chrome://help to Buildbot compilation
R=dbeam@chromium.org
BUG=393873
TEST=GYP_GENERATORS=ninja gyp --depth . third_party/closure_compiler/compiled_resources.gyp && ninja -C out/Default
Review URL: https://codereview.chromium.org/622243002
Cr-Commit-Position: refs/heads/master@{#297982}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/closure_compiler/compiled_resources.gyp | 1 | ||||
| -rw-r--r-- | third_party/closure_compiler/processor.py | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/third_party/closure_compiler/compiled_resources.gyp b/third_party/closure_compiler/compiled_resources.gyp index a3249b9..624e5c5 100644 --- a/third_party/closure_compiler/compiled_resources.gyp +++ b/third_party/closure_compiler/compiled_resources.gyp @@ -10,6 +10,7 @@ '../../chrome/browser/resources/bookmark_manager/js/compiled_resources.gyp:*', '../../chrome/browser/resources/downloads/compiled_resources.gyp:*', '../../chrome/browser/resources/extensions/compiled_resources.gyp:*', + '../../chrome/browser/resources/help/compiled_resources.gyp:*', '../../chrome/browser/resources/history/compiled_resources.gyp:*', '../../chrome/browser/resources/options/compiled_resources.gyp:*', '../../chrome/browser/resources/ntp4/compiled_resources.gyp:*', diff --git a/third_party/closure_compiler/processor.py b/third_party/closure_compiler/processor.py index be6b797..d25f8c0 100644 --- a/third_party/closure_compiler/processor.py +++ b/third_party/closure_compiler/processor.py @@ -85,7 +85,12 @@ class Processor(object): match = re.search(self._INCLUDE_REG, current_line[2]) if match: file_dir = os.path.dirname(current_line[0]) - self._include_file(os.path.join(file_dir, match.group(1))) + file_name = os.path.abspath(os.path.join(file_dir, match.group(1))) + if file_name in self._included_files: + self._lines[self._index] = self._lines[self._index][:2] + ("",) + self._index += 1 + else: + self._include_file(file_name) else: self._index += 1 |