manifest: (All) integrate libpng (libpng-turbo) 1.5.7 beta 01

Use the linaro_android_4.0.1 branch for libpng that integrates libpng
1.5.7 beta 01. There are interface changes in this libpng version
compared to what AOSP uses. Corresponding changes are required in:

 * external/skia/src/images/
   file SkImageDecoder_libpng.cpp

 * platform/bootable/recovery/
   file Android.mk
   file minui/resources.c

* platform/frameworks/base/
   file tools/aapt/Images.cpp
   file tools/aapt/ZipFile.h

The corrosponding projects have been forked and are included in the
manifest change.

Signed-off-by: Tony Mansson <tony.mansson@linaro.org>
Change-Id: Ia6b110735b33babb69d0d8032897c82864ec03fe

9 files changed, 27 insertions, 27 deletions

diff --git a/default.xml b/default.xml
index 625b2afc8..31302b07b 100644
--- a/default.xml
+++ b/default.xml
@@ -66,12 +66,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -137,7 +139,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -163,7 +164,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/landing-panda.xml b/landing-panda.xml
index 743a57eb1..33c5b00e9 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -66,12 +66,14 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
   <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -139,7 +141,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -165,7 +166,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 82dfa4c7c..777d8c0bc 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -70,12 +70,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -141,7 +143,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -167,7 +168,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 815fb226b..fb7ffbc67 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -67,12 +67,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -138,7 +140,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -164,7 +165,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/staging-origen.xml b/staging-origen.xml
index f263f99f8..7dc1eab94 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -72,12 +72,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -143,7 +145,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -169,7 +170,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 7af90e090..69e0ee22e 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -66,12 +66,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -137,7 +139,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -163,7 +164,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index e121a53b0..4e8c9df6a 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -70,12 +70,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -141,7 +143,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -167,7 +168,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml
index f6c34c012..0b093efd7 100644
--- a/staging-vexpress-a9.xml
+++ b/staging-vexpress-a9.xml
@@ -68,12 +68,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -139,7 +141,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -165,7 +166,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 8810e4694..b49c9b0b2 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -66,12 +66,14 @@
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_4.0.1" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.1" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_4.0.1" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
@@ -137,7 +139,6 @@
   <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/lohit-fonts" name="platform/external/lohit-fonts" />
@@ -163,7 +164,6 @@
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="platform/external/skia" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />