diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-08-23 00:31:20 +0200 |
---|---|---|
committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-08-23 00:31:20 +0200 |
commit | ca83eb31349749622f1c3a6204645fb68c1ec7d0 (patch) | |
tree | 6221534bf340b8984d25b027001291785d9d6f47 /staging-galaxynexus.xml | |
parent | 45d2190dc395734194cef4189038b6ca47c00718 (diff) |
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-galaxynexus.xml')
-rw-r--r-- | staging-galaxynexus.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml index 2b0e847..c35ea08 100644 --- a/staging-galaxynexus.xml +++ b/staging-galaxynexus.xml @@ -106,7 +106,6 @@ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" /> <project path="external/mesa3d" name="platform/external/mesa3d" 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: need to be restored --> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/> @@ -268,6 +267,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" /> |