ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons - Issue 7736016: Revert 98616 - Landing chrome side of nacl change pre-dating ppapi switch.

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/tests/ppapi_browser/extension_mime_handler/nacl.scons

Issue 7736016: Revert 98616 - Landing chrome side of nacl change pre-dating ppapi switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 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/tests/ppapi_browser/crash/nacl.scons ('k') | ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons

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

--- ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons (revision 98628)

+++ ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons (working copy)

@@ -13,8 +13,6 @@

Import('env')

env.Prepend(CPPDEFINES=['XP_UNIX'])

-env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +

- 'extension_mime_handler')

nexe = 'ppapi_extension_mime_handler_%s' % env.get('TARGET_FULLARCH')

@@ -29,11 +27,9 @@

# Copy the extension into place (as a subdir in the staging dir).

dest_copy = env.Replicate('$STAGING_DIR/ppapi_extension_mime_handler',

- ['manifest.json',

+ ['ppapi_extension_mime_handler.nmf',

+ 'manifest.json',

env.File('$STAGING_DIR/' + nexe + '$PROGSUFFIX')])

-dest_copy.append(env.CopyLibsForExtension(

- '$STAGING_DIR/ppapi_extension_mime_handler',

- '$STAGING_DIR/ppapi_extension_mime_handler.nmf'))

env.Depends(env.Alias(nexe), dest_copy)

@@ -44,7 +40,6 @@

node = env.PPAPIBrowserTester('ppapi_extension_mime_handler.out',

url='ppapi_extension_mime_handler.html',

- nmf='${TEST_DIR}/ppapi_extension_mime_handler.nmf',

extensions=[env.Dir('$STAGING_DIR/ppapi_extension_mime_handler')],

files=env.ExtractPublishedFiles(nexe))