diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 15:49:17 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 15:49:17 +0000 |
| commit | d3059d0ea04e8a2132c5a6df452da4c523df7be3 (patch) | |
| tree | 53e581df10e85be797c1c5cf5d37f87499980231 /native_client_sdk | |
| parent | 4ca4c0df4a18387e76a71b3952f467ba118c5f60 (diff) | |
| download | chromium_src-d3059d0ea04e8a2132c5a6df452da4c523df7be3.zip chromium_src-d3059d0ea04e8a2132c5a6df452da4c523df7be3.tar.gz chromium_src-d3059d0ea04e8a2132c5a6df452da4c523df7be3.tar.bz2 | |
Revert 174144
> Revert 174015
> > [NaCl SDK] Add pepper_25 bundle
> >
> > This will update to 25.0.1364.2 -> r173761
> >
> > BUG=none
> > TBR=noelallen@chromium.org
> > NOTRY=true
> >
> >
> > Review URL: https://chromiumcodereview.appspot.com/11638025
>
> Lots of PPAPINaCl*.URLLoader* tests timing out on win7 dbg tests bot since this change. Reverting to see whether it improves the situation
>
> TBR=binji@chromium.org
> Review URL: https://codereview.chromium.org/11638038
The test also fails without this, so reverting the revert
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/11637038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/build_tools/json/naclsdk_manifest2.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json b/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json index 8c6b446..1551086 100644 --- a/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json +++ b/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json @@ -256,6 +256,16 @@ "revision": 0 }, { + "name": "pepper_25", + "description": "Chrome 25 bundle, revision xxxxx", + "stability": "dev", + "recommended": "no", + "version": 25, + "repath": "pepper_25", + "archives": [], + "revision": 0 + }, + { "name": "pepper_canary", "description": "Chrome Canary", "stability": "canary", |