summaryrefslogtreecommitdiff
path: root/chromium/components/nacl
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-25 11:39:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-25 15:20:42 +0000
commit6c91641271e536ffaa88a1dff5127e42ee99a91e (patch)
tree703d9dd49602377ddc90cbf886aad37913f2496b /chromium/components/nacl
parentb145b7fafd36f0c260d6a768c81fc14e32578099 (diff)
downloadqtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/components/nacl')
-rw-r--r--chromium/components/nacl/renderer/plugin/plugin.gyp2
-rw-r--r--chromium/components/nacl/renderer/plugin/plugin.gypi6
2 files changed, 0 insertions, 8 deletions
diff --git a/chromium/components/nacl/renderer/plugin/plugin.gyp b/chromium/components/nacl/renderer/plugin/plugin.gyp
index 2df9069129b..6f002945ffe 100644
--- a/chromium/components/nacl/renderer/plugin/plugin.gyp
+++ b/chromium/components/nacl/renderer/plugin/plugin.gyp
@@ -19,9 +19,7 @@
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
'<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
- '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
'<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
- '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:sel_ldr_launcher_base',
'<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
'<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service',
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp_objects',
diff --git a/chromium/components/nacl/renderer/plugin/plugin.gypi b/chromium/components/nacl/renderer/plugin/plugin.gypi
index e7f31710fb7..34ae5c41e4e 100644
--- a/chromium/components/nacl/renderer/plugin/plugin.gypi
+++ b/chromium/components/nacl/renderer/plugin/plugin.gypi
@@ -13,10 +13,7 @@
'pnacl_resources.cc',
'pnacl_translate_thread.cc',
'ppapi_entrypoints.cc',
- 'sel_ldr_launcher_chrome.cc',
'service_runtime.cc',
- 'srpc_client.cc',
- 'srpc_params.cc',
'temporary_file.cc',
'utility.cc',
],
@@ -33,9 +30,6 @@
'cflags': [
'-Wno-long-long',
],
- 'cflags!': [
- '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
- ],
'conditions': [
['asan!=1 and msan!=1 and ubsan_vptr!=1', {
'ldflags': [