From 5981a442b5f1a67497c5cb72c980a2fe796a5e75 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 3 Aug 2015 14:34:57 +0200
Subject: [PATCH] Backed out changeset b8eacfe11fc5 (bug 1186748)

---
 .../tooltool-manifests/linux32/valgrind.manifest | 16 ++++++++++++++++
 .../tooltool-manifests/linux64/valgrind.manifest | 16 ++++++++++++++++
 build/valgrind/valgrind.sh                       |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 browser/config/tooltool-manifests/linux32/valgrind.manifest
 create mode 100644 browser/config/tooltool-manifests/linux64/valgrind.manifest

diff --git a/browser/config/tooltool-manifests/linux32/valgrind.manifest b/browser/config/tooltool-manifests/linux32/valgrind.manifest
new file mode 100644
index 00000000000..80c50dfaea9
--- /dev/null
+++ b/browser/config/tooltool-manifests/linux32/valgrind.manifest
@@ -0,0 +1,16 @@
+[
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512", 
+"filename": "gcc.tar.xz",
+"unpack": true
+},
+{
+"size": 167175,
+"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2",
+"unpack": true
+}
+]
diff --git a/browser/config/tooltool-manifests/linux64/valgrind.manifest b/browser/config/tooltool-manifests/linux64/valgrind.manifest
new file mode 100644
index 00000000000..80c50dfaea9
--- /dev/null
+++ b/browser/config/tooltool-manifests/linux64/valgrind.manifest
@@ -0,0 +1,16 @@
+[
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512", 
+"filename": "gcc.tar.xz",
+"unpack": true
+},
+{
+"size": 167175,
+"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2",
+"unpack": true
+}
+]
diff --git a/build/valgrind/valgrind.sh b/build/valgrind/valgrind.sh
index c46f18876d0..9857792176a 100755
--- a/build/valgrind/valgrind.sh
+++ b/build/valgrind/valgrind.sh
@@ -25,7 +25,7 @@ else
     _arch=32
 fi
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux${_arch}/releng.manifest
+TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux${_arch}/valgrind.manifest
 TOOLTOOL_SERVER=https://api.pub.build.mozilla.org/tooltool/
 (cd $srcdir; python /builds/tooltool.py --url $TOOLTOOL_SERVER --overwrite -m $TOOLTOOL_MANIFEST fetch ${TOOLTOOL_CACHE:+ -c ${TOOLTOOL_CACHE}}) || exit 2