diff options
author | Zach Pfeffer <zach.pfeffer@linaro.org> | 2011-12-12 21:45:12 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2011-12-12 21:45:12 +0000 |
commit | d903bd5515940b6633a65b6046ae46869e5a6461 (patch) | |
tree | 13d568d017e668c0dbb81a6a9ef07531eaa13498 | |
parent | 41dea17d64a50dfa6e16f40c4122fafba6bc0f80 (diff) |
Revert "manifest: (All) use linaro_android_4.0.1 branch for libpng"
This reverts commit 41dea17d64a50dfa6e16f40c4122fafba6bc0f80
-rw-r--r-- | default.xml | 2 | ||||
-rw-r--r-- | staging-iMX53.xml | 2 | ||||
-rw-r--r-- | staging-origen.xml | 2 | ||||
-rw-r--r-- | staging-panda.xml | 2 | ||||
-rw-r--r-- | staging-snowball.xml | 2 | ||||
-rw-r--r-- | staging-vexpress-a9.xml | 2 | ||||
-rw-r--r-- | tracking-panda.xml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/default.xml b/default.xml index 559a6f2..d3132e0 100644 --- a/default.xml +++ b/default.xml @@ -62,7 +62,6 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.1"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.1"/> <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.1"/> - <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" /> <!-- AOSP --> <project path="abi/cpp" name="platform/abi/cpp" /> @@ -138,6 +137,7 @@ <project path="external/libnl-headers" name="platform/external/libnl-headers" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> + <project path="external/libpng" name="platform/external/libpng" /> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/llvm" name="platform/external/llvm" /> diff --git a/staging-iMX53.xml b/staging-iMX53.xml index 528b927..d50e39c 100644 --- a/staging-iMX53.xml +++ b/staging-iMX53.xml @@ -63,7 +63,6 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.1"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.1"/> <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.1"/> - <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" /> <!-- AOSP --> <project path="abi/cpp" name="platform/abi/cpp" /> @@ -139,6 +138,7 @@ <project path="external/libnl-headers" name="platform/external/libnl-headers" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> + <project path="external/libpng" name="platform/external/libpng" /> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/llvm" name="platform/external/llvm" /> diff --git a/staging-origen.xml b/staging-origen.xml index 0262933..f2ff1e7 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -69,7 +69,6 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.1"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.1"/> <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.1"/> - <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" /> <!-- AOSP --> <project path="abi/cpp" name="platform/abi/cpp" /> @@ -144,6 +143,7 @@ <project path="external/libnl-headers" name="platform/external/libnl-headers" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> + <project path="external/libpng" name="platform/external/libpng" /> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/llvm" name="platform/external/llvm" /> diff --git a/staging-panda.xml b/staging-panda.xml index ca8c45d..2deb732 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -62,7 +62,6 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.1"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.1"/> <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.1"/> - <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" /> <!-- AOSP --> <project path="abi/cpp" name="platform/abi/cpp" /> @@ -138,6 +137,7 @@ <project path="external/libnl-headers" name="platform/external/libnl-headers" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> + <project path="external/libpng" name="platform/external/libpng" /> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/llvm" name="platform/external/llvm" /> diff --git a/staging-snowball.xml b/staging-snowball.xml index f283d38..1be4912 100644 --- a/staging-snowball.xml +++ b/staging-snowball.xml @@ -67,7 +67,6 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.1"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.1"/> <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.1"/> - <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" /> <!-- AOSP --> <project path="abi/cpp" name="platform/abi/cpp" /> @@ -142,6 +141,7 @@ <project path="external/libnl-headers" name="platform/external/libnl-headers" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> + <project path="external/libpng" name="platform/external/libpng" /> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/llvm" name="platform/external/llvm" /> diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml index 67f657f..fcfd995 100644 --- a/staging-vexpress-a9.xml +++ b/staging-vexpress-a9.xml @@ -64,7 +64,6 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.1"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.1"/> <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.1"/> - <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" /> <!-- AOSP --> <project path="abi/cpp" name="platform/abi/cpp" /> @@ -140,6 +139,7 @@ <project path="external/libnl-headers" name="platform/external/libnl-headers" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> + <project path="external/libpng" name="platform/external/libpng" /> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/llvm" name="platform/external/llvm" /> diff --git a/tracking-panda.xml b/tracking-panda.xml index 4de8485..b9edba3 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -62,7 +62,6 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.1"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.1"/> <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.1"/> - <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" /> <!-- AOSP --> <project path="abi/cpp" name="platform/abi/cpp" /> @@ -138,6 +137,7 @@ <project path="external/libnl-headers" name="platform/external/libnl-headers" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> + <project path="external/libpng" name="platform/external/libpng" /> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/llvm" name="platform/external/llvm" /> |