summaryrefslogtreecommitdiff
path: root/staging-origen.xml
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-23 00:31:20 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-23 00:31:20 +0200
commitca83eb31349749622f1c3a6204645fb68c1ec7d0 (patch)
tree6221534bf340b8984d25b027001291785d9d6f47 /staging-origen.xml
parent45d2190dc395734194cef4189038b6ca47c00718 (diff)
downloadmanifest-ca83eb31349749622f1c3a6204645fb68c1ec7d0.tar.gz
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.
Diffstat (limited to 'staging-origen.xml')
-rw-r--r--staging-origen.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/staging-origen.xml b/staging-origen.xml
index e242e81..dea20a4 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -126,7 +126,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 modifications: Fixed aliasing violations, ISO C++11 support -->
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
@@ -276,6 +275,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" />