Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//remoting/remoting_locales.gni") | 5 import("//remoting/remoting_locales.gni") |
| 6 import("//tools/grit/grit_rule.gni") | 6 import("//tools/grit/grit_rule.gni") |
| 7 | 7 |
| 8 if (is_android) { | 8 if (is_android) { |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 "../webapp/crd/js/host_setup_dialog.js", | 40 "../webapp/crd/js/host_setup_dialog.js", |
| 41 "../webapp/crd/js/host_table_entry.js", | 41 "../webapp/crd/js/host_table_entry.js", |
| 42 "../webapp/crd/manifest.json.jinja2", | 42 "../webapp/crd/manifest.json.jinja2", |
| 43 "../webapp/crd/js/paired_client_manager.js", | 43 "../webapp/crd/js/paired_client_manager.js", |
| 44 "../webapp/crd/js/desktop_remoting.js", | 44 "../webapp/crd/js/desktop_remoting.js", |
| 45 "../webapp/crd/js/window_frame.js", | 45 "../webapp/crd/js/window_frame.js", |
| 46 ] | 46 ] |
| 47 | 47 |
| 48 inputs = [ "remoting_strings.grd" ] + sources_to_verify | 48 inputs = [ "remoting_strings.grd" ] + sources_to_verify |
| 49 | 49 |
| 50 stampfile = "$root_build_dir/remoting_resources_verified_stamp" | 50 stampfile = "$root_out_dir/remoting_resources_verified_stamp" |
|
Wez
2017/04/18 18:05:26
These changes don't seem related to the CL descrip
sdefresne
2017/04/19 08:59:03
Those changes correspond to the following part of
Wez
2017/04/20 03:41:21
Acknowledged, but consider clarifying in the descr
| |
| 51 outputs = [ | 51 outputs = [ |
| 52 stampfile, | 52 stampfile, |
| 53 ] | 53 ] |
| 54 | 54 |
| 55 args = [ | 55 args = [ |
| 56 "-t", | 56 "-t", |
| 57 rebase_path(stampfile, root_build_dir), | 57 rebase_path(stampfile, root_build_dir), |
| 58 "-r", | 58 "-r", |
| 59 rebase_path("remoting_strings.grd", root_build_dir), | 59 rebase_path("remoting_strings.grd", root_build_dir), |
| 60 ] + rebase_path(sources_to_verify, root_build_dir) | 60 ] + rebase_path(sources_to_verify, root_build_dir) |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 } | 108 } |
| 109 } | 109 } |
| 110 | 110 |
| 111 action("copy_locales") { | 111 action("copy_locales") { |
| 112 script = "../tools/build/remoting_copy_locales.py" | 112 script = "../tools/build/remoting_copy_locales.py" |
| 113 | 113 |
| 114 # The gyp build calls out to Python, but the Python just computes a simple | 114 # The gyp build calls out to Python, but the Python just computes a simple |
| 115 # replacement over the locales. Here, we can do this in GN script by | 115 # replacement over the locales. Here, we can do this in GN script by |
| 116 # pretending the locale list is a list of files. The {{source_name_part}} | 116 # pretending the locale list is a list of files. The {{source_name_part}} |
| 117 # will just expand to the locale name. | 117 # will just expand to the locale name. |
| 118 inputs = process_file_template(remoting_locales, | 118 inputs = process_file_template( |
| 119 [ "$target_gen_dir/{{source_name_part}}.pak" ]) | 119 remoting_locales, |
| 120 [ "$root_gen_dir/remoting/resources/{{source_name_part}}.pak" ]) | |
| 120 | 121 |
| 121 # Likewise, process the outputs in the same way as the inputs. | 122 # Likewise, process the outputs in the same way as the inputs. |
| 122 if (is_mac || is_ios) { | 123 if (is_mac || is_ios) { |
| 123 # On mac, use underscores instead of hyphens and put the files in a | 124 # On mac, use underscores instead of hyphens and put the files in a |
| 124 # different place. | 125 # different place. |
| 125 outputs = process_file_template( | 126 outputs = process_file_template( |
| 126 remoting_locales_with_underscores, | 127 remoting_locales_with_underscores, |
| 127 [ "$root_build_dir/remoting/resources/{{source_name_part}}.lproj/loc ale.pak" ]) | 128 [ "$root_out_dir/remoting/resources/{{source_name_part}}.lproj/local e.pak" ]) |
| 128 } else { | 129 } else { |
| 129 outputs = process_file_template( | 130 outputs = process_file_template( |
| 130 remoting_locales, | 131 remoting_locales, |
| 131 [ "$root_build_dir/remoting_locales/{{source_name_part}}.pak" ]) | 132 [ "$root_out_dir/remoting_locales/{{source_name_part}}.pak" ]) |
| 132 } | 133 } |
| 133 | 134 |
| 134 args = [ | 135 args = [ |
| 135 "-p", | 136 "-p", |
| 136 current_os, | 137 current_os, |
| 137 "-g", | 138 "-g", |
| 138 rebase_path(root_gen_dir, root_build_dir), | 139 rebase_path(root_gen_dir, root_build_dir), |
| 139 "-x", | 140 "-x", |
| 140 rebase_path(root_out_dir, root_build_dir), | 141 rebase_path(root_out_dir, root_build_dir), |
| 141 ] + remoting_locales | 142 ] + remoting_locales |
| 142 | 143 |
| 143 deps = [ | 144 deps = [ |
| 144 ":strings", | 145 ":strings", |
| 145 ] | 146 ] |
| 146 } | 147 } |
| OLD | NEW |