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 | |
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.
-rw-r--r-- | default.xml | 2 | ||||
-rw-r--r-- | landing-snowball.xml | 2 | ||||
-rw-r--r-- | linaro-default.xml | 2 | ||||
-rw-r--r-- | staging-galaxynexus.xml | 2 | ||||
-rw-r--r-- | staging-origen.xml | 2 | ||||
-rw-r--r-- | staging-panda.xml | 2 | ||||
-rw-r--r-- | staging-vexpress-rtsm-isw.xml | 2 | ||||
-rw-r--r-- | staging-vexpress-rtsm.xml | 2 | ||||
-rw-r--r-- | staging-vexpress.xml | 2 | ||||
-rw-r--r-- | tracking-panda.xml | 2 | ||||
-rw-r--r-- | tracking-snowball.xml | 2 | ||||
-rw-r--r-- | tracking-vexpress.xml | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/default.xml b/default.xml index 3ca3097..70d8af1 100644 --- a/default.xml +++ b/default.xml @@ -141,7 +141,6 @@ <!-- 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="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" /> - <project path="external/zlib" name="platform/external/zlib" revision="linaro_android_4.1.1" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -275,6 +274,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" /> diff --git a/landing-snowball.xml b/landing-snowball.xml index bf6c841..f68115b 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -129,7 +129,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" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> @@ -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" /> diff --git a/linaro-default.xml b/linaro-default.xml index bf108eb..482de30 100644 --- a/linaro-default.xml +++ b/linaro-default.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" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> @@ -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" /> 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" /> 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" /> diff --git a/staging-panda.xml b/staging-panda.xml index 57fe912..592d406 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -121,7 +121,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" /> @@ -274,6 +273,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" /> diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml index 1970ddd..aace27f 100644 --- a/staging-vexpress-rtsm-isw.xml +++ b/staging-vexpress-rtsm-isw.xml @@ -134,7 +134,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" /> @@ -286,6 +285,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" /> diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml index 856045c..f15870c 100644 --- a/staging-vexpress-rtsm.xml +++ b/staging-vexpress-rtsm.xml @@ -134,7 +134,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" /> @@ -285,6 +284,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" /> 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" /> diff --git a/tracking-panda.xml b/tracking-panda.xml index 689b210..1b03e94 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -121,7 +121,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" /> @@ -273,6 +272,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" /> diff --git a/tracking-snowball.xml b/tracking-snowball.xml index 7237d09..66ad99c 100644 --- a/tracking-snowball.xml +++ b/tracking-snowball.xml @@ -126,7 +126,6 @@ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" /> <project path="external/ping6" name="platform/external/ping6" 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" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> @@ -274,6 +273,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" /> diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml index 4787d93..df9fc47 100644 --- a/tracking-vexpress.xml +++ b/tracking-vexpress.xml @@ -124,7 +124,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" /> @@ -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" /> |