diff options
-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 70d8af1..3ca3097 100644 --- a/default.xml +++ b/default.xml @@ -141,6 +141,7 @@ <!-- 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" /> @@ -274,7 +275,6 @@ <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 f68115b..bf6c841 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -129,6 +129,7 @@ <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,7 +277,6 @@ <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 482de30..bf108eb 100644 --- a/linaro-default.xml +++ b/linaro-default.xml @@ -126,6 +126,7 @@ <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" /> @@ -275,7 +276,6 @@ <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 c35ea08..2b0e847 100644 --- a/staging-galaxynexus.xml +++ b/staging-galaxynexus.xml @@ -106,6 +106,7 @@ <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"/> @@ -267,7 +268,6 @@ <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 dea20a4..e242e81 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -126,6 +126,7 @@ <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" /> @@ -275,7 +276,6 @@ <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 592d406..57fe912 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -121,6 +121,7 @@ <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,7 +274,6 @@ <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 aace27f..1970ddd 100644 --- a/staging-vexpress-rtsm-isw.xml +++ b/staging-vexpress-rtsm-isw.xml @@ -134,6 +134,7 @@ <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,7 +286,6 @@ <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 f15870c..856045c 100644 --- a/staging-vexpress-rtsm.xml +++ b/staging-vexpress-rtsm.xml @@ -134,6 +134,7 @@ <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" /> @@ -284,7 +285,6 @@ <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 d7de82f..dd498ea 100644 --- a/staging-vexpress.xml +++ b/staging-vexpress.xml @@ -125,6 +125,7 @@ <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,7 +277,6 @@ <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 1b03e94..689b210 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -121,6 +121,7 @@ <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" /> @@ -272,7 +273,6 @@ <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 55ed845..b7602bd 100644 --- a/tracking-snowball.xml +++ b/tracking-snowball.xml @@ -124,6 +124,7 @@ <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,7 +275,6 @@ <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 df9fc47..4787d93 100644 --- a/tracking-vexpress.xml +++ b/tracking-vexpress.xml @@ -124,6 +124,7 @@ <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" /> @@ -275,7 +276,6 @@ <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" /> |