Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ppapi / native_client / src / trusted / plugin / plugin.gypi

diff --git a/src/ppapi/native_client/src/trusted/plugin/plugin.gypi b/src/ppapi/native_client/src/trusted/plugin/plugin.gypi
index 7f3bff4..fd70909 100644 (file)
--- a/src/ppapi/native_client/src/trusted/plugin/plugin.gypi
+++ b/src/ppapi/native_client/src/trusted/plugin/plugin.gypi
@@ -17,7 +17,6 @@
       'pnacl_options.cc',
       'pnacl_resources.cc',
       'pnacl_translate_thread.cc',
-      'scriptable_plugin.cc',
       'sel_ldr_launcher_chrome.cc',
       'service_runtime.cc',
       'srpc_client.cc',
@@ -61,7 +60,7 @@
           '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
         ],
         'conditions': [
-          ['asan!=1', {
+          ['asan!=1 and msan!=1', {
             'ldflags': [
               # Catch unresolved symbols.
               '-Wl,-z,defs',