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 # Keep in sync with targets in remoting/remoting_client.gypi. | 5 # Keep in sync with targets in remoting/remoting_client.gypi. |
| 6 | 6 |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//remoting/webapp/build_template.gni") | 8 import("//remoting/webapp/build_template.gni") |
| 9 import("//remoting/webapp/files.gni") | 9 import("//remoting/webapp/files.gni") |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 "--file-template", | 28 "--file-template", |
| 29 rebase_path("base/html/credits.tmpl", root_build_dir), | 29 rebase_path("base/html/credits.tmpl", root_build_dir), |
| 30 "--entry-template", | 30 "--entry-template", |
| 31 rebase_path("base/html/credits_entry.tmpl", root_build_dir), | 31 rebase_path("base/html/credits_entry.tmpl", root_build_dir), |
| 32 ] | 32 ] |
| 33 } | 33 } |
| 34 | 34 |
| 35 desktop_remoting_webapp("webapp") { | 35 desktop_remoting_webapp("webapp") { |
| 36 webapp_type = "desktop" | 36 webapp_type = "desktop" |
| 37 output_dir = "$root_build_dir/remoting/remoting-webapp.v2" | 37 output_dir = "$root_build_dir/remoting/remoting-webapp.v2" |
| 38 zip_path = "$root_build_dir/remoting/remoting-webapp.v2.zip" | 38 zip_path = "$root_build_dir/remoting-webapp.v2.zip" |
| 39 | |
| 40 pexe_dir = get_label_info( | |
|
Sergey Ulanov
2015/11/03 18:21:37
I don't think you need this. desktop_remoting_weba
Dirk Pranke
2015/11/03 21:10:20
So it does. Will fix.
| |
| 41 "//remoting/client/plugin:remoting_client_plugin_newlib(//build/toolch ain/nacl:newlib_pnacl)", | |
| 42 "root_out_dir") | |
| 43 | |
| 39 extra_files = [ | 44 extra_files = [ |
| 40 "crd/remoting_client_pnacl.nmf.jinja2", | 45 "crd/remoting_client_pnacl.nmf.jinja2", |
| 41 # TODO(garykac): Get correct path to this. | 46 "$pexe_dir/remoting_client_plugin_newlib.pexe", |
| 42 #"<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe", | |
| 43 ] | 47 ] |
| 44 } | 48 } |
| 45 | 49 |
| 46 app_remoting_webapp("ar_sample_app") { | 50 app_remoting_webapp("ar_sample_app") { |
| 47 app_key = "Sample_App" | 51 app_key = "Sample_App" |
| 48 app_id = "ljacajndfccfgnfohlgkdphmbnpkjflk" | 52 app_id = "ljacajndfccfgnfohlgkdphmbnpkjflk" |
| 49 app_client_id = "sample_client_id" | 53 app_client_id = "sample_client_id" |
| 50 app_vendor = "" | 54 app_vendor = "" |
| 51 app_name = "sample_app" | 55 app_name = "sample_app" |
| 52 app_fullname = "App Remoting Client" | 56 app_fullname = "App Remoting Client" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 rebase_path(outputs, root_build_dir) + [ | 141 rebase_path(outputs, root_build_dir) + [ |
| 138 rebase_path(remoting_webapp_unittests_template_main, root_build_dir), | 142 rebase_path(remoting_webapp_unittests_template_main, root_build_dir), |
| 139 "--exclude-js", | 143 "--exclude-js", |
| 140 ] + | 144 ] + |
| 141 rebase_path(remoting_webapp_unittests_exclude_js_files, root_build_dir) + | 145 rebase_path(remoting_webapp_unittests_exclude_js_files, root_build_dir) + |
| 142 [ | 146 [ |
| 143 "--js-list-file", | 147 "--js-list-file", |
| 144 rebase_path(file_list, root_build_dir), | 148 rebase_path(file_list, root_build_dir), |
| 145 ] + [ "--instrument-js" ] + rebase_path(webapp_js_files, root_build_dir) | 149 ] + [ "--instrument-js" ] + rebase_path(webapp_js_files, root_build_dir) |
| 146 } | 150 } |
| OLD | NEW |