summaryrefslogtreecommitdiffstats
path: root/ppapi/thunk
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2015-02-25 19:30:58 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-26 03:31:51 +0000
commit6065cf751340a8a99b670357b2053ed6df12a7af (patch)
tree77cc6c789079d3ba13c287eba19e16eca2ad69c3 /ppapi/thunk
parent5c7a0dc6f337f8a2c086df5ef0d9b6d4984bffe5 (diff)
downloadchromium_src-6065cf751340a8a99b670357b2053ed6df12a7af.zip
chromium_src-6065cf751340a8a99b670357b2053ed6df12a7af.tar.gz
chromium_src-6065cf751340a8a99b670357b2053ed6df12a7af.tar.bz2
Land prep work to enable NaCl in the Linux x64 GN builds.
This should get most of NaCl and the PPAPI stuff needed for NaCl building and linking. There is more work to be done to get some of the test binaries working (and probably fill out parts of the NaCl SDK) and possibly some pnacl support work remaining as well. NaCl is still disabled by default (set enable_nacl=true to change). Enabling nacl is still mostly untested and likely doesn't work at all :). R=ncbray@chromium.org, brettw@chromium.org BUG=432959 CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/877553008 Cr-Commit-Position: refs/heads/master@{#318180}
Diffstat (limited to 'ppapi/thunk')
-rw-r--r--ppapi/thunk/BUILD.gn2
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/thunk/BUILD.gn b/ppapi/thunk/BUILD.gn
index 43128cc..eef06a2 100644
--- a/ppapi/thunk/BUILD.gn
+++ b/ppapi/thunk/BUILD.gn
@@ -120,7 +120,6 @@ source_set("thunk") {
"ppb_var_array_thunk.cc",
"ppb_var_dictionary_thunk.cc",
"ppb_video_capture_api.h",
- "ppb_video_capture_thunk.cc",
"ppb_video_decoder_api.h",
"ppb_video_decoder_dev_api.h",
"ppb_video_decoder_thunk.cc",
@@ -169,6 +168,7 @@ source_set("thunk") {
"ppb_scrollbar_thunk.cc",
"ppb_talk_private_thunk.cc",
"ppb_url_util_thunk.cc",
+ "ppb_video_capture_thunk.cc",
"ppb_video_decoder_dev_thunk.cc",
]
}