Skip to content

GitLab

T
tangled
Commit 63a028cb authored by dbeam's avatar dbeam Committed by Commit bot
Browse files
Options

Closure: convert the rest of chrome/browser/resources/ to v2 GYP 

R=dpapad@chromium.org
BUG=585553
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2881523002
Cr-Commit-Position: refs/heads/master@{#472236}
parent ed669ecd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 413 additions and 142 deletions
chrome/browser/resources/chromeos/compiled_resources.gyp deleted 100644 → 0
View file @ ed669ecd
# Copyright 2015 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.
{
'targets': [
{
'target_name': 'bluetooth_pair_device',
'variables': {
'depends': [
'../../../../chrome/browser/resources/options/compiled_resources.gyp:options_bundle',
],
'externs': ['<(EXTERNS_DIR)/chrome_send.js'],
},
'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
},
{
'target_name': 'certificate_manager_dialog',
'variables': {
'depends': [
'../../../../chrome/browser/resources/options/compiled_resources.gyp:options_bundle',
],
'externs': ['<(EXTERNS_DIR)/chrome_send.js'],
},
'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
},
],
}
chrome/browser/resources/chromeos/compiled_resources2.gyp 0 → 100644
View file @ 63a028cb
This diff is collapsed.
chrome/browser/resources/help/compiled_resources.gyp deleted 100644 → 0
View file @ ed669ecd
# Copyright 2014 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.
{
'targets': [
{
'target_name': 'help',
'variables': {
'depends': [
'../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
'../../../../ui/webui/resources/js/assert.js',
'../../../../ui/webui/resources/js/cr.js',
'../../../../ui/webui/resources/js/cr/event_target.js',
'../../../../ui/webui/resources/js/cr/ui.js',
'../../../../ui/webui/resources/js/cr/ui/bubble.js',
'../../../../ui/webui/resources/js/cr/ui/focus_manager.js',
'../../../../ui/webui/resources/js/cr/ui/focus_outline_manager.js',
'../../../../ui/webui/resources/js/cr/ui/overlay.js',
'../../../../ui/webui/resources/js/cr/ui/page_manager/page.js',
'../../../../ui/webui/resources/js/cr/ui/page_manager/page_manager.js',
'../../../../ui/webui/resources/js/event_tracker.js',
'../../../../ui/webui/resources/js/promise_resolver.js',
'../../../../ui/webui/resources/js/util.js',
'../../../../chrome/browser/resources/help/channel_change_page.js',
'../../../../chrome/browser/resources/help/help_page.js',
'../../../../chrome/browser/resources/options/compiled_resources.gyp:options_bundle',
],
'externs': ['<(EXTERNS_DIR)/chrome_send.js'],
},
'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
}
],
}
chrome/browser/resources/help/compiled_resources2.gyp 0 → 100644
View file @ 63a028cb
# Copyright 2017 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.
{
'targets': [
{
'target_name': 'help',
'variables': {
'extra_inputs': [
'<!@(python <(CLOSURE_DIR)/build/get_includes.py ../options/options_bundle.js)',
],
'script_args': ['--custom_sources', '--custom_includes'],
'source_files': [
'<(DEPTH)/third_party/jstemplate/util.js',
'<(DEPTH)/third_party/jstemplate/jsevalcontext.js',
'<(DEPTH)/third_party/jstemplate/jstemplate.js',
'<(DEPTH)/ui/webui/resources/cr_elements/network/cr_onc_types.js',
'<(DEPTH)/ui/webui/resources/js/action_link.js',
'<(DEPTH)/ui/webui/resources/js/cr.js',
'<(DEPTH)/ui/webui/resources/js/cr/event_target.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/array_data_model.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/autocomplete_list.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/bubble.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/bubble_button.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/command.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/controlled_indicator.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/focus_manager.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/focus_outline_manager.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/focus_without_ink.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_item.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_selection_controller.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_selection_model.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_single_selection_model.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/grid.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/menu.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/menu_item.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/overlay.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/position_util.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/node_utils.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/page_manager/page.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/page_manager/page_manager.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/repeating_button.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/touch_handler.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/tree.js',
'<(DEPTH)/ui/webui/resources/js/event_tracker.js',
'<(DEPTH)/ui/webui/resources/js/icon.js',
'<(DEPTH)/ui/webui/resources/js/load_time_data.js',
'<(DEPTH)/ui/webui/resources/js/parse_html_subset.js',
'<(DEPTH)/ui/webui/resources/js/promise_resolver.js',
'<(DEPTH)/ui/webui/resources/js/util.js',
'../chromeos/keyboard/keyboard_utils.js',
'<(DEPTH)/ui/webui/resources/js/i18n_behavior.js',
'<(DEPTH)/ui/webui/resources/js/web_ui_listener_behavior.js',
'../settings/route.js',
'../settings/people_page/easy_unlock_browser_proxy.js',
'../settings/people_page/fingerprint_browser_proxy.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selection-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-selector/iron-multi-selectable-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menu-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menubar-behavior-extracted.js',
'<(DEPTH)/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector_grid.js',
'<(DEPTH)/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.js',
'../settings/people_page/lock_screen_constants.js',
'<(DEPTH)/third_party/closure_compiler/externs/quick_unlock_private.js',
'../settings/people_page/lock_state_behavior.js',
'../settings/people_page/password_prompt_dialog.js',
'<(DEPTH)/ui/webui/resources/js/assert.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-meta/iron-meta-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-inky-focus-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-icon-button/paper-icon-button-extracted.js',
'<(DEPTH)/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js',
'../settings/people_page/lock_screen.js',
'<(DEPTH)/third_party/closure_compiler/externs/bluetooth.js',
'<(DEPTH)/third_party/closure_compiler/externs/bluetooth_private.js',
'<(DEPTH)/third_party/closure_compiler/externs/management.js',
'<(DEPTH)/third_party/closure_compiler/externs/metrics_private.js',
'<(DEPTH)/third_party/closure_compiler/externs/networking_private.js',
'<(DEPTH)/third_party/closure_compiler/externs/chrome_send.js',
'<(DEPTH)/third_party/closure_compiler/externs/web_animations.js',
'<(DEPTH)/ui/webui/resources/cr_elements/network/cr_network_icon_externs.js',
'../options/options_bundle.js',
# Note: ^ this is just a copy of
# ../options/compiled_resources2.gyp:options_bundle#source_files. Most
# of this code is deprecated, but please keep in sync if you really
# need to change.
'channel_change_page.js',
'help_page.js',
],
},
'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
}
],
}
chrome/browser/resources/options/compiled_resources.gyp deleted 100644 → 0
View file @ ed669ecd
# Copyright 2014 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.
{
'targets': [
{
'target_name': 'options_bundle',
'variables': {
'depends': [
'../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate',
'../../../../ui/webui/resources/cr_elements/network/cr_onc_types.js',
'../../../../ui/webui/resources/js/action_link.js',
'../../../../ui/webui/resources/js/cr.js',
'../../../../ui/webui/resources/js/cr/event_target.js',
'../../../../ui/webui/resources/js/cr/ui.js',
'../../../../ui/webui/resources/js/cr/ui/array_data_model.js',
'../../../../ui/webui/resources/js/cr/ui/autocomplete_list.js',
'../../../../ui/webui/resources/js/cr/ui/bubble.js',
'../../../../ui/webui/resources/js/cr/ui/bubble_button.js',
'../../../../ui/webui/resources/js/cr/ui/command.js',
'../../../../ui/webui/resources/js/cr/ui/controlled_indicator.js',
'../../../../ui/webui/resources/js/cr/ui/focus_manager.js',
'../../../../ui/webui/resources/js/cr/ui/focus_outline_manager.js',
'../../../../ui/webui/resources/js/cr/ui/focus_without_ink.js',
'../../../../ui/webui/resources/js/cr/ui/grid.js',
'../../../../ui/webui/resources/js/cr/ui/list.js',
'../../../../ui/webui/resources/js/cr/ui/list_item.js',
'../../../../ui/webui/resources/js/cr/ui/list_selection_controller.js',
'../../../../ui/webui/resources/js/cr/ui/list_selection_model.js',
'../../../../ui/webui/resources/js/cr/ui/list_single_selection_model.js',
'../../../../ui/webui/resources/js/cr/ui/menu.js',
'../../../../ui/webui/resources/js/cr/ui/menu_item.js',
'../../../../ui/webui/resources/js/cr/ui/overlay.js',
'../../../../ui/webui/resources/js/cr/ui/position_util.js',
'../../../../ui/webui/resources/js/cr/ui/page_manager/page.js',
'../../../../ui/webui/resources/js/cr/ui/page_manager/page_manager.js',
'../../../../ui/webui/resources/js/cr/ui/repeating_button.js',
'../../../../ui/webui/resources/js/cr/ui/touch_handler.js',
'../../../../ui/webui/resources/js/cr/ui/tree.js',
'../../../../ui/webui/resources/js/event_tracker.js',
'../../../../ui/webui/resources/js/icon.js',
'../../../../ui/webui/resources/js/load_time_data.js',
'../../../../ui/webui/resources/js/parse_html_subset.js',
'../../../../ui/webui/resources/js/promise_resolver.js',
'../../../../ui/webui/resources/js/util.js',
'../../../../chrome/browser/resources/chromeos/keyboard/keyboard_utils.js',
'../../../../ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
'../../../../ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_behavior',
'../settings/compiled_resources2.gyp:route',
'../settings/people_page/compiled_resources2.gyp:easy_unlock_browser_proxy',
'../settings/people_page/compiled_resources2.gyp:fingerprint_browser_proxy',
'../settings/people_page/compiled_resources2.gyp:lock_screen_constants',
'../settings/people_page/compiled_resources2.gyp:lock_state_behavior',
'../settings/people_page/compiled_resources2.gyp:password_prompt_dialog',
'../settings/people_page/compiled_resources2.gyp:lock_screen',
],
# options_bundle is included as a complex dependency. Currently there is
# no possibility to use gyp variable expansion to it, so we don't use
# <(CLOSURE_DIR) in the "externs" line.
'externs': [
'../../../../third_party/closure_compiler/externs/bluetooth.js',
'../../../../third_party/closure_compiler/externs/bluetooth_private.js',
'../../../../third_party/closure_compiler/externs/management.js',
'../../../../third_party/closure_compiler/externs/metrics_private.js',
'../../../../third_party/closure_compiler/externs/networking_private.js',
'../../../../third_party/closure_compiler/externs/chrome_send.js',
'../../../../third_party/closure_compiler/externs/quick_unlock_private.js',
'../../../../third_party/closure_compiler/externs/web_animations.js',
'../../../../ui/webui/resources/cr_elements/network/cr_network_icon_externs.js',
],
},
'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
}
],
}
chrome/browser/resources/options/compiled_resources2.gyp 0 → 100644
View file @ 63a028cb
# Copyright 2015 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.
{
'targets': [
{
'target_name': 'options_bundle',
'variables': {
'extra_inputs': [
'<!@(python <(CLOSURE_DIR)/build/get_includes.py options_bundle.js)',
],
'script_args': ['--custom_sources', '--custom_includes'],
'source_files': [
# Note: this code is deprecated. If you really need to change this
# list for some reason, please also update the copies at:
# ../help/compiled_resources2.gyp:help#source_files
# ../chromeos/compiled_resources2.gyp:*#source_files
'<(DEPTH)/third_party/jstemplate/util.js',
'<(DEPTH)/third_party/jstemplate/jsevalcontext.js',
'<(DEPTH)/third_party/jstemplate/jstemplate.js',
'<(DEPTH)/ui/webui/resources/cr_elements/network/cr_onc_types.js',
'<(DEPTH)/ui/webui/resources/js/action_link.js',
'<(DEPTH)/ui/webui/resources/js/cr.js',
'<(DEPTH)/ui/webui/resources/js/cr/event_target.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/array_data_model.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/autocomplete_list.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/bubble.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/bubble_button.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/command.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/controlled_indicator.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/focus_manager.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/focus_outline_manager.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/focus_without_ink.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_item.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_selection_controller.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_selection_model.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/list_single_selection_model.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/grid.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/menu.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/menu_item.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/overlay.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/position_util.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/node_utils.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/page_manager/page.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/page_manager/page_manager.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/repeating_button.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/touch_handler.js',
'<(DEPTH)/ui/webui/resources/js/cr/ui/tree.js',
'<(DEPTH)/ui/webui/resources/js/event_tracker.js',
'<(DEPTH)/ui/webui/resources/js/icon.js',
'<(DEPTH)/ui/webui/resources/js/load_time_data.js',
'<(DEPTH)/ui/webui/resources/js/parse_html_subset.js',
'<(DEPTH)/ui/webui/resources/js/promise_resolver.js',
'<(DEPTH)/ui/webui/resources/js/util.js',
'../chromeos/keyboard/keyboard_utils.js',
'<(DEPTH)/ui/webui/resources/js/i18n_behavior.js',
'<(DEPTH)/ui/webui/resources/js/web_ui_listener_behavior.js',
'../settings/route.js',
'../settings/people_page/easy_unlock_browser_proxy.js',
'../settings/people_page/fingerprint_browser_proxy.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selection-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-selector/iron-selectable-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-selector/iron-multi-selectable-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menu-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menubar-behavior-extracted.js',
'<(DEPTH)/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector_grid.js',
'<(DEPTH)/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.js',
'../settings/people_page/lock_screen_constants.js',
'<(DEPTH)/third_party/closure_compiler/externs/quick_unlock_private.js',
'../settings/people_page/lock_state_behavior.js',
'../settings/people_page/password_prompt_dialog.js',
'<(DEPTH)/ui/webui/resources/js/assert.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-meta/iron-meta-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-inky-focus-behavior-extracted.js',
'<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-icon-button/paper-icon-button-extracted.js',
'<(DEPTH)/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js',
'../settings/people_page/lock_screen.js',
'<(DEPTH)/third_party/closure_compiler/externs/bluetooth.js',
'<(DEPTH)/third_party/closure_compiler/externs/bluetooth_private.js',
'<(DEPTH)/third_party/closure_compiler/externs/management.js',
'<(DEPTH)/third_party/closure_compiler/externs/metrics_private.js',
'<(DEPTH)/third_party/closure_compiler/externs/networking_private.js',
'<(DEPTH)/third_party/closure_compiler/externs/chrome_send.js',
'<(DEPTH)/third_party/closure_compiler/externs/web_animations.js',
'<(DEPTH)/ui/webui/resources/cr_elements/network/cr_network_icon_externs.js',
'options_bundle.js',
],
},
'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
},
],
}
third_party/closure_compiler/compile2.py
View file @ 63a028cb
......@@ -189,7 +189,7 @@ class Checker(object):
return tmp_file.name
def check(self, sources, out_file, closure_args=None,
custom_sources=True):
custom_sources=True, custom_includes=False):
"""Closure compile |sources| while checking for errors.
Args:
......@@ -209,6 +209,10 @@ class Checker(object):
externs_and_deps = [self._POLYMER_EXTERNS]
if custom_sources:
if custom_includes:
# TODO(dbeam): this is fairly hacky. Can we just remove custom_sources
# soon when all the things kept on life support using it die?
self._target = sources.pop()
externs_and_deps += sources
else:
self._target = sources[0]
......@@ -225,7 +229,8 @@ class Checker(object):
js_args = deps + ([self._target] if self._target else [])
if not custom_sources:
process_includes = custom_includes or not custom_sources
if process_includes:
# TODO(dbeam): compiler.jar automatically detects "@externs" in a --js arg
# and moves these files to a different AST tree. However, because we use
# one big funky <include> meta-file, it thinks all the code is one big
......@@ -290,7 +295,7 @@ class Checker(object):
with open(out_file, 'w') as f:
f.write('')
if not custom_sources:
if process_includes:
filtered_errors = self._filter_errors(errors)
errors = map(self._clean_up_error, filtered_errors)
output = self._format_errors(errors)
......@@ -312,6 +317,9 @@ if __name__ == "__main__":
help="Path to a source file to typecheck")
parser.add_argument("--custom_sources", action="store_true",
help="Whether this rules has custom sources.")
parser.add_argument("--custom_includes", action="store_true",
help="If present, <include>s are processed when"
"using --custom_files.")
parser.add_argument("-o", "--out_file", required=True,
help="A file where the compiled output is written to")
parser.add_argument("-c", "--closure_args", nargs=argparse.ZERO_OR_MORE,
......@@ -324,7 +332,8 @@ if __name__ == "__main__":
found_errors, stderr = checker.check(opts.sources, out_file=opts.out_file,
closure_args=opts.closure_args,
custom_sources=opts.custom_sources)
custom_sources=opts.custom_sources,
custom_includes=opts.custom_includes)
if found_errors:
if opts.custom_sources:
......
third_party/closure_compiler/compiled_resources.gyp
View file @ 63a028cb
......@@ -20,9 +20,6 @@
'target_name': 'compiled_resources',
'type': 'none',
'dependencies': [
'../../chrome/browser/resources/chromeos/compiled_resources.gyp:*',
'../../chrome/browser/resources/help/compiled_resources.gyp:*',
'../../chrome/browser/resources/options/compiled_resources.gyp:*',
'../../ui/file_manager/file_manager/foreground/js/compiled_resources.gyp:*',
],
},
......
third_party/closure_compiler/compiled_resources2.gyp
View file @ 63a028cb
......@@ -16,6 +16,7 @@
'dependencies': [
'<(DEPTH)/chrome/browser/resources/bookmark_manager/js/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/chromeos/braille_ime/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/chromeos/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/chromeos/login/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/chromeos/network_ui/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/chromeos/quick_unlock/compiled_resources2.gyp:*',
......@@ -23,6 +24,7 @@
'<(DEPTH)/chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/cleanup_tool/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/extensions/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/help/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/md_bookmarks/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/md_downloads/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/md_extensions/compiled_resources2.gyp:*',
......@@ -32,6 +34,7 @@
'<(DEPTH)/chrome/browser/resources/media_router/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/ntp4/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/offline_pages/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/options/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/settings/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/print_preview/compiled_resources2.gyp:*',
'<(DEPTH)/chrome/browser/resources/uber/compiled_resources2.gyp:*',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment