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

Unified Diff: ppapi/proxy/BUILD.gn

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yet more feedback 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 | « ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn ('k') | ppapi/shared_impl/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/BUILD.gn
diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
index a475780727496988a0e886276a910a52a0498b2f..1cab50cbdd8c7fb33483292436da6cba1963f5da 100644
--- a/ppapi/proxy/BUILD.gn
+++ b/ppapi/proxy/BUILD.gn
@@ -184,8 +184,12 @@ component("proxy") {
"url_response_info_resource.cc",
"url_response_info_resource.h",
"var_serialization_rules.h",
+ "video_decoder_resource.cc",
+ "video_decoder_resource.h",
"video_destination_resource.cc",
"video_destination_resource.h",
+ "video_encoder_resource.cc",
+ "video_encoder_resource.h",
"video_frame_resource.cc",
"video_frame_resource.h",
"video_source_resource.cc",
@@ -258,10 +262,6 @@ component("proxy") {
"talk_resource.h",
"video_capture_resource.cc",
"video_capture_resource.h",
- "video_decoder_resource.cc",
- "video_decoder_resource.h",
- "video_encoder_resource.cc",
- "video_encoder_resource.h",
]
}
@@ -269,8 +269,6 @@ component("proxy") {
deps = [
"//base",
- "//base/third_party/dynamic_annotations",
- "//gin",
"//gpu/command_buffer/client:gles2_implementation",
"//gpu/ipc",
"//ipc",
@@ -278,19 +276,23 @@ component("proxy") {
"//ppapi/c",
"//ppapi/proxy:ipc",
"//ppapi/shared_impl",
- "//skia",
"//third_party/icu",
- "//ui/events:events_base",
- "//ui/surface",
]
- # TODO(GYP) support chrome_multiple_dll
- #if (chrome_multiple_dll) {
- # deps += [ "//third_party/WebKit/public:blink_minimal" ]
- #} else {
- deps += [ "//third_party/WebKit/public:blink" ]
-
- #}
+ if (is_nacl) {
+ deps += [
+ "//ui/events:latency_info",
+ "//mojo/nacl:mojo",
+ ]
+ } else {
+ deps += [
+ "//base/third_party/dynamic_annotations",
+ "//gin",
+ "//skia",
+ "//ui/events:events_base",
+ "//ui/surface",
+ ]
+ }
}
source_set("ipc") {
@@ -327,9 +329,13 @@ source_set("ipc") {
"//ipc",
"//ppapi/c",
"//ppapi/shared_impl",
- "//skia",
- "//ui/events/ipc",
]
+ if (!is_nacl) {
+ deps += [
+ "//skia",
+ "//ui/events/ipc",
+ ]
+ }
}
source_set("test_support") {
« no previous file with comments | « ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn ('k') | ppapi/shared_impl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698