From ca83eb31349749622f1c3a6204645fb68c1ec7d0 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Thu, 23 Aug 2012 00:31:20 +0200
Subject: Revert "manifests: (All) Use Linaro branch of zlib"

The Linaro branch of zlib is no longer needed because it just contains a
workaround for broken host compilers.
Those have a global workaround in build/core now.

This reverts commit 74f789a3e3579fb87c1ca51aac41df962af302e2.
---
 staging-vexpress.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'staging-vexpress.xml')

diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index dd498ea..d7de82f 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -125,7 +125,6 @@
   <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.1" />
-  <project path="external/zlib" name="platform/external/zlib" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -277,6 +276,7 @@
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
+  <project path="external/zlib" name="platform/external/zlib" />
   <project path="external/zxing" name="platform/external/zxing" />
   <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" />
   <project path="frameworks/mff" name="platform/frameworks/mff" />
-- 
cgit v1.2.3