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

Unified Diff: remoting/client/plugin/BUILD.gn

Issue 965633002: Add remoting and PPAPI tests to GN build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge fix Created 5 years, 10 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/client/BUILD.gn ('k') | remoting/codec/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/BUILD.gn
diff --git a/remoting/client/plugin/BUILD.gn b/remoting/client/plugin/BUILD.gn
index 2f45f6248c7192ebda0c26fd6479430261a444ec..9594824dccc21b37188e81bee96da54f2c04bbeb 100644
--- a/remoting/client/plugin/BUILD.gn
+++ b/remoting/client/plugin/BUILD.gn
@@ -2,16 +2,22 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-static_library("plugin") {
- gypi_values = exec_script("//build/gypi_to_gn.py",
- [ rebase_path("../../remoting_srcs.gypi") ],
- "scope",
- [ "../../remoting_srcs.gypi" ])
+import("//remoting/remoting_srcs.gni")
+source_set("plugin") {
sources =
- rebase_path(gypi_values.remoting_client_plugin_sources, ".", "//remoting")
+ rebase_path(remoting_srcs_gypi_values.remoting_client_plugin_sources,
+ ".",
+ "//remoting")
- # TODO(brettw) when a nacl version of this target is made, these files
+ if (!is_chromeos) {
+ sources -= [
+ "normalizing_input_filter_cros.cc",
+ "normalizing_input_filter_cros.h",
+ ]
+ }
+
+ # TODO(GYP) when a nacl version of this target is made, these files
# won't be part of it.
sources += [
"pepper_entrypoints.cc",
@@ -28,6 +34,7 @@ static_library("plugin") {
"//ppapi/cpp/private:internal_module",
"//remoting/base",
"//remoting/client",
+ "//remoting/codec",
"//remoting/protocol",
"//third_party/webrtc/modules/desktop_capture",
"//ui/events:dom4_keycode_converter",
« no previous file with comments | « remoting/client/BUILD.gn ('k') | remoting/codec/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698