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

Unified Diff: ppapi/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: clean up for review 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
Index: ppapi/BUILD.gn
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
index 3a1865681f5f5bf6cfd141ac29160121e67fb07e..c7fac320f9c3ff247629f2a9582997c7c495edcf 100644
--- a/ppapi/BUILD.gn
+++ b/ppapi/BUILD.gn
@@ -94,6 +94,30 @@ source_set("ppapi_gles2") {
# ]
#}
+if (is_nacl) {
+ gypi_values = exec_script("//build/gypi_to_gn.py",
+ [ rebase_path("ppapi_sources.gypi") ],
+ "scope",
+ [ "ppapi_sources.gypi" ])
+
+ component("ppapi_cpp_lib") {
+ sources = gypi_values.cpp_source_files + [
+ "cpp/module_embedder.h",
+ "cpp/ppp_entrypoints.cc",
+ ]
+ }
+
+ component("ppapi_gles2_lib") {
+ sources = [
+ "lib/gl/gles2/gl2ext_ppapi.c",
+ "lib/gl/gles2/gl2ext_ppapi.h",
+ "lib/gl/gles2/gles2.c",
+ ]
+
+ include_dirs = [ "lib/gl/include" ]
+ }
+}
+
component("ppapi_shared") {
sources = [
"shared_impl/array_var.cc",
@@ -326,7 +350,6 @@ component("ppapi_shared") {
"thunk/ppb_var_array_thunk.cc",
"thunk/ppb_var_dictionary_thunk.cc",
"thunk/ppb_video_capture_api.h",
- "thunk/ppb_video_capture_thunk.cc",
"thunk/ppb_video_decoder_api.h",
"thunk/ppb_video_decoder_dev_api.h",
"thunk/ppb_video_decoder_thunk.cc",
@@ -381,6 +404,7 @@ component("ppapi_shared") {
"thunk/ppb_scrollbar_thunk.cc",
"thunk/ppb_talk_private_thunk.cc",
"thunk/ppb_url_util_thunk.cc",
+ "thunk/ppb_video_capture_thunk.cc",
"thunk/ppb_video_decoder_dev_thunk.cc",
]
}
@@ -429,6 +453,17 @@ component("ppapi_shared") {
"//url",
]
+ if (is_nacl) {
+ deps -= [
+ "//base/third_party/dynamic_annotations",
+ "//skia",
+ "//ui/events:events_base",
+ "//ui/surface",
+ ]
+
+ public_deps -= [ blink_target ]
+ }
+
if (is_mac) {
libs = [ "QuartzCore.framework" ]
} else if (is_win) {
@@ -473,6 +508,11 @@ source_set("ppapi_ipc") {
if (is_nacl) {
sources -= [ "proxy/serialized_flash_menu.cc" ]
+
+ deps -= [
+ "//skia",
+ "//ui/events/ipc",
+ ]
}
}
@@ -648,6 +688,8 @@ component("ppapi_proxy") {
"proxy/url_response_info_resource.cc",
"proxy/url_response_info_resource.h",
"proxy/var_serialization_rules.h",
+ "proxy/video_decoder_resource.cc",
+ "proxy/video_decoder_resource.h",
"proxy/video_destination_resource.cc",
"proxy/video_destination_resource.h",
"proxy/video_frame_resource.cc",
@@ -718,8 +760,6 @@ component("ppapi_proxy") {
"proxy/ppp_instance_private_proxy.h",
"proxy/ppp_video_decoder_proxy.cc",
"proxy/ppp_video_decoder_proxy.h",
- "proxy/video_decoder_resource.cc",
- "proxy/video_decoder_resource.h",
"proxy/talk_resource.cc",
"proxy/talk_resource.h",
"proxy/video_capture_resource.cc",
@@ -747,6 +787,19 @@ component("ppapi_proxy") {
blink_target,
]
+ if (is_nacl) {
+ deps -= [
+ "//base/third_party/dynamic_annotations",
+ "//gin",
+ "//skia",
+ "//ui/events:events_base",
+ "//ui/surface",
+ blink_target,
+ ]
+
+ deps += [ "//ui/events:latency_info" ]
+ }
+
if (is_win) {
cflags = [ "/wd4267" ] # size_t to int truncation.
}

Powered by Google App Engine
This is Rietveld 408576698