Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Side by Side Diff: remoting/webapp/build_template.gni

Issue 1152583011: Refactor compile_js.gypi to support script_args and closure_args (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix inputs.py Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi. 5 # Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi.
6 6
7 import("//build/config/chrome_build.gni") 7 import("//build/config/chrome_build.gni")
8 import("//remoting/remoting_locales.gni") 8 import("//remoting/remoting_locales.gni")
9 import("//remoting/remoting_options.gni") 9 import("//remoting/remoting_options.gni")
10 import("//remoting/remoting_version.gni") 10 import("//remoting/remoting_version.gni")
11 import("//remoting/webapp/files.gni") 11 import("//remoting/webapp/files.gni")
12 import("//third_party/closure_compiler/closure_args.gni")
12 13
13 # The base remoting directory that is used as the root directory for file 14 # The base remoting directory that is used as the root directory for file
14 # references. Many of the scripts rely on the files being specified relative 15 # references. Many of the scripts rely on the files being specified relative
15 # to this directory. 16 # to this directory.
16 remoting_dir = "//remoting" 17 remoting_dir = "//remoting"
17 18
18 buildtype = "Dev" 19 buildtype = "Dev"
19 if (!is_debug) { 20 if (!is_debug) {
20 if (is_official_build) { 21 if (is_official_build) {
21 buildtype = "Official" 22 buildtype = "Official"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 target_jscompile_stamp = "$target_gen_dir/${target_jscompile}.stamp" 55 target_jscompile_stamp = "$target_gen_dir/${target_jscompile}.stamp"
55 action(target_jscompile) { 56 action(target_jscompile) {
56 js_files = remoting_webapp_js_proto_files + invoker.js_files 57 js_files = remoting_webapp_js_proto_files + invoker.js_files
57 58
58 script = "../../third_party/closure_compiler/compile.py" 59 script = "../../third_party/closure_compiler/compile.py"
59 inputs = js_files 60 inputs = js_files
60 outputs = [ 61 outputs = [
61 target_jscompile_stamp, 62 target_jscompile_stamp,
62 ] 63 ]
63 64
64 args = [ 65 extra_closure_args = [
65 "--strict", 66 "jscomp_error=reportUnknownTypes",
66 "--no-single-file", 67 "jscomp_error=duplicate",
67 "--externs", 68 "jscomp_error=misplacedTypeAnnotation",
68 "../../third_party/closure_compiler/externs/chrome_extensions.js",
69 "--success-stamp",
70 rebase_path(target_jscompile_stamp, root_build_dir),
71 ] 69 ]
72 args += rebase_path(js_files, root_build_dir) 70
71 args = rebase_path(js_files, root_build_dir)
72 args +=
73 [
74 "--no-single-file",
75 "--externs",
76 "../../third_party/closure_compiler/externs/chrome_extensions.js",
77 "--out-file",
78 rebase_path(target_jscompile_stamp, root_build_dir),
79 "--closure-args",
80 ] + closure_args + extra_closure_args
73 } 81 }
74 } 82 }
75 83
76 action(target_name) { 84 action(target_name) {
77 html_template_file = invoker.html_template_file 85 html_template_file = invoker.html_template_file
78 html_template_include_files = invoker.html_template_include_files 86 html_template_include_files = invoker.html_template_include_files
79 js_files = invoker.js_files 87 js_files = invoker.js_files
80 html_output = invoker.html_output 88 html_output = invoker.html_output
81 89
82 script = "build-html.py" 90 script = "build-html.py"
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 args += [ 416 args += [
409 "--manifest_key", 417 "--manifest_key",
410 manifest_key, 418 manifest_key,
411 ] 419 ]
412 args += [ 420 args += [
413 "--app_client_id", 421 "--app_client_id",
414 app_client_id, 422 app_client_id,
415 ] 423 ]
416 } 424 }
417 } 425 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698