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

Unified Diff: remoting/webapp/build_template.gni

Issue 1312463005: Compile remoting client plugin with GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/signaling/BUILD.gn ('k') | third_party/boringssl/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/build_template.gni
diff --git a/remoting/webapp/build_template.gni b/remoting/webapp/build_template.gni
index 003ef13af7389e56ba6b611fa1c653cd8d242525..7053cd60e8dad308f2d42057e22e1fae065accc0 100644
--- a/remoting/webapp/build_template.gni
+++ b/remoting/webapp/build_template.gni
@@ -5,6 +5,7 @@
# Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi.
import("//build/config/chrome_build.gni")
+import("//build/config/features.gni")
import("//build/util/version.gni")
import("//remoting/remoting_locales.gni")
import("//remoting/remoting_options.gni")
@@ -183,6 +184,17 @@ template("desktop_remoting_webapp") {
"$target_gen_dir/credits.html",
]
+ if (enable_pnacl) {
+ pexe_dir = get_label_info(
+ "//remoting/client/plugin:remoting_client_plugin_newlib(//build/toolchain/nacl:newlib_pnacl)",
+ "root_out_dir")
+
+ extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe" ]
+ if (is_debug) {
+ extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe.debug" ]
+ }
+ }
+
inputs = [ rebase_path("crd/manifest.json.jinja2", root_build_dir) ] +
remoting_version_files +
rebase_path(remoting_webapp_crd_files, root_build_dir) +
@@ -202,6 +214,12 @@ template("desktop_remoting_webapp") {
"//remoting/webapp:credits",
]
+ if (enable_pnacl) {
+ deps += [
+ "//remoting/client/plugin:remoting_client_plugin_newlib(//build/toolchain/nacl:newlib_pnacl)",
+ ]
+ }
+
# Create a file that contains a list of all the resource files needed
# to build the webapp. This is needed to avoid problems on platforms that
# limit the size of a command line.
« no previous file with comments | « remoting/signaling/BUILD.gn ('k') | third_party/boringssl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698