| Index: ppapi/native_client/src/trusted/plugin/plugin.gyp
|
| ===================================================================
|
| --- ppapi/native_client/src/trusted/plugin/plugin.gyp (revision 152430)
|
| +++ ppapi/native_client/src/trusted/plugin/plugin.gyp (working copy)
|
| @@ -60,7 +60,6 @@
|
| 'target_base': 'ppNaClPlugin',
|
| },
|
| 'dependencies': [
|
| - '<(DEPTH)/media/media.gyp:shared_memory_support',
|
| '<(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',
|
| @@ -93,7 +92,6 @@
|
| ],
|
| },
|
| 'dependencies': [
|
| - '<(DEPTH)/media/media.gyp:shared_memory_support',
|
| '<(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',
|
|
|
| Property changes on: ppapi/native_client/src/trusted/plugin/plugin.gyp
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|