summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-16 17:50:53 +0000
committernoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-16 17:50:53 +0000
commit657e275956c8a0e82009bcaf85101eda7d4a5232 (patch)
tree7ccd7c799b30cfbf0a48676a30e2fec633b94170
parent59b4e9b28b22df0b6b690052af96d9b558475350 (diff)
downloadchromium_src-657e275956c8a0e82009bcaf85101eda7d4a5232.zip
chromium_src-657e275956c8a0e82009bcaf85101eda7d4a5232.tar.gz
chromium_src-657e275956c8a0e82009bcaf85101eda7d4a5232.tar.bz2
Merge 131291 - Add the plugin to the SDK
Adds the standalone version of the PPAPI PlugIn to the SDK for use in debugging. BUG=122099 Review URL: https://chromiumcodereview.appspot.com/10023005 TBR=noelallen@google.com Review URL: https://chromiumcodereview.appspot.com/10093014 git-svn-id: svn://svn.chromium.org/chrome/branches/1084/src@132425 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ppapi/native_client/src/trusted/plugin/build.scons5
1 files changed, 5 insertions, 0 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/build.scons b/ppapi/native_client/src/trusted/plugin/build.scons
index 46ef65e..a8a5f68 100644
--- a/ppapi/native_client/src/trusted/plugin/build.scons
+++ b/ppapi/native_client/src/trusted/plugin/build.scons
@@ -169,6 +169,11 @@ else: # mac
plugin_env.Alias('plugin', plugin_env.GetPPAPIPluginPath(False))
+if env.Bit('windows'):
+ env.SDKInstallBin(ppNaClPlugin + '.dll', ppapi_plugin)
+else:
+ env.SDKInstallBin(ppNaClPlugin + '.so', ppapi_plugin)
+
###############################################################################
# PPAPI Plugin Test
###############################################################################