manifest: Create 4.0.4 branch

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

1 files changed, 46 insertions, 43 deletions

diff --git a/staging-origen.xml b/staging-origen.xml
index 1219c3e..01c899b 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -11,7 +11,7 @@
            fetch="https://android.googlesource.com/" />
   <remote  name="linaro-other"
            fetch="git://git.linaro.org/" />
-  <default revision="refs/tags/android-4.0.3_r1"
+  <default revision="refs/tags/android-4.0.4_r1.1"
            remote="aosp"
            sync-j="4" />
 
@@ -19,18 +19,18 @@
   <project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
 
   <!-- Linaro extras -->
-  <project path="hardware/samsung/origen/gralloc_ump" name="platform/hardware/samsung/origen/gralloc_ump" revision="linaro_android_4.0.3" />
-  <project path="hardware/samsung/origen/ump" name="platform/hardware/samsung/origen/ump" revision="linaro_android_4.0.3" />
-  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_4.0.3" />
-  <project path="device/linaro/origen" name="device/linaro/origen" revision="linaro_android_4.0.3" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_4.0.3" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_4.0.3" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
+  <project path="hardware/samsung/origen/gralloc_ump" name="platform/hardware/samsung/origen/gralloc_ump" revision="linaro_android_4.0.4" />
+  <project path="hardware/samsung/origen/ump" name="platform/hardware/samsung/origen/ump" revision="linaro_android_4.0.4" />
+  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_4.0.4" />
+  <project path="device/linaro/origen" name="device/linaro/origen" revision="linaro_android_4.0.4" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_4.0.4" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_4.0.4" />
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.4" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" />
   <project path="external/x264" name="platform/external/x264" revision="linaro-master" />
   <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
-  <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro_android_4.0.3" remote="linaro-android" />
+  <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro_android_4.0.4" remote="linaro-android" />
   <project path="u-boot" name="people/angus/u-boot" revision="origen" remote="linaro-other"/>
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
@@ -50,44 +50,42 @@
   <!-- /project -->
 
   <!-- AOSP with Linaro additions -->
-  <project path="build" name="platform/build" revision="linaro_android_4.0.3">
+  <project path="build" name="platform/build" revision="linaro_android_4.0.4">
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.0.3" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.0.3" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" revision="linaro_android_4.0.3" />
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro_android_4.0.3" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.0.3" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.0.3" />
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.0.3" />
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.0.3" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.3" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.3" />
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.3" />
-  <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.0.3"/>
-  <project path="bionic" name="platform/bionic" revision="linaro_android_4.0.3"/>
-  <project path="external/srec" name="platform/external/srec" revision="linaro_android_4.0.3"/>
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.0.3"/>
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.0.3"/>
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.0.3"/>
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.3"/>
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.3"/>
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.3"/>
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.3"/>
-  <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.3"/>
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.3"/>
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.3"/>
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.3"/>
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.0.4" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.0.4" />
+  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro_android_4.0.4" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.0.4" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.0.4" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.0.4" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.4" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.4" />
+  <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.0.4"/>
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.0.4"/>
+  <project path="external/srec" name="platform/external/srec" revision="linaro_android_4.0.4"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.0.4"/>
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.0.4"/>
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.0.4"/>
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.4"/>
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.4"/>
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.0.4"/>
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.4"/>
+  <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.4"/>
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.4"/>
+  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.4"/>
+  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.4"/>
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
-  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.0.3" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.3" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.3" />
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" revision="linaro_android_4.0.3" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.0.4" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
+  <project path="system/bluetooth" name="platform/system/bluetooth" revision="linaro_android_4.0.4" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
-  <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
-  <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/>
+  <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
+  <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -105,6 +103,8 @@
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
   <project path="device/sample" name="device/sample" />
   <project path="device/samsung/maguro" name="device/samsung/maguro" />
+  <project path="device/samsung/torospr" name="device/samsung/torospr" />
+  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="device/samsung/tuna" name="device/samsung/tuna" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/android-mock" name="platform/external/android-mock" />
@@ -145,6 +145,7 @@
   <project path="external/harfbuzz" name="platform/external/harfbuzz" />
   <project path="external/hyphenation" name="platform/external/hyphenation" />
   <project path="external/iproute2" name="platform/external/iproute2" />
+  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
   <project path="external/iptables" name="platform/external/iptables" />
   <project path="external/javasqlite" name="platform/external/javasqlite" />
   <project path="external/javassist" name="platform/external/javassist" />
@@ -187,6 +188,7 @@
   <project path="external/qemu" name="platform/external/qemu" />
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
+  <project path="external/replicaisland" name="platform/external/replicaisland" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
@@ -278,6 +280,7 @@
   <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" />
   <project path="prebuilt" name="platform/prebuilt" />
   <project path="sdk" name="platform/sdk" />
+  <project path="system/extras" name="platform/system/extras" />
   <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />