ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp - Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp

Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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

« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_audio.cc ('k') | ppapi/native_client/src/trusted/plugin/plugin.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp

===================================================================

--- ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp (revision 152430)

+++ ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp (working copy)

@@ -11,8 +11,7 @@

'target_name': 'ppruntime_lib',

'type': 'none',

'dependencies': [

- '<(DEPTH)/native_client/tools.gyp:prep_toolchain',

- '<(DEPTH)/media/media_untrusted.gyp:shared_memory_support_untrusted',

+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain'

'variables': {

'nlib_target': 'libppruntime.a',

@@ -20,7 +19,6 @@

'build_newlib': 1,

'include_dirs': [

'<(DEPTH)/gpu',

- '<(DEPTH)/media',

'<(DEPTH)/third_party/khronos',

'<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted',

Property changes on: ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp

___________________________________________________________________

Added: svn:mergeinfo