From 8ea166933b7fd330f22a4d99cf6c6acb4332e39b Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Mon, 23 Jul 2012 21:50:36 +0159
Subject: manifests: Create 4.1.1 based manifest for vexpress

Change-Id: I47d354136c8e564bb342904b7cc806aa9590676e
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 staging-vexpress.xml | 207 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 143 insertions(+), 64 deletions(-)

diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 4f229c3..9e2736d 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -5,10 +5,10 @@
            fetch="git://android.git.linaro.org/"
            review="review.android.git.linaro.org" />
   <remote  name="aosp-upstream"
-           fetch="https://android.googlesource.com/" />
+           fetch="https://android-review.googlesource.com/" />
   <remote  name="linaro-other"
            fetch="git://git.linaro.org/" />
-  <default revision="refs/tags/android-4.0.4_r2.1"
+  <default revision="refs/tags/android-4.1.1_r3"
            remote="aosp"
            sync-j="4" />
 
@@ -19,12 +19,12 @@
   <project path="packages/apps/DisableSuspend" name="platform/packages/apps/DisableSuspend" revision="master" />
   <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="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_jb" />
   <project path="device/linaro/common" name="device/linaro/common" revision="linaro-ics" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro-ics" />
-  <project path="hardware/linaro/tinyhal" name="people/kurt-r-taylor/tinyhal" revision="linaro" remote="linaro-other" />
-  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro-ics" remote="aosp" />
-  <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-ics" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro-jb" />
+  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro-jb" />
+  <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-jb" />
+  <project path="hardware/linaro/tinyhal" name="platform/hardware/linaro/tinyhal" revision="linaro-jellybean" />
   <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.19" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" />
   <project path="external/x264" name="platform/external/x264" revision="linaro-master" />
@@ -44,7 +44,8 @@
   <project path="external/stringbench" name="platform/external/stringbench" revision="master" />
   <!-- Make sure only one of the kernels is enabled! -->
   <!-- Linaro kernel -->
-  <project path="kernel" name="kernel/vexpress-a9" revision="armlt-linaro-android-3.4" />
+  <!-- Upstream is: project path="kernel" name="people/andygreen/repo-branch-archive" revision="tilt-android-tracking" remote="linaro-other" / -->
+  <project path="kernel" name="kernel/vexpress-a9" revision="armlt-linaro-android-3.5" />
   <!-- AOSP kernel -->
   <!-- project path="kernel" name="kernel/omap" revision="android-omap-panda-3.0" -->
     <!-- We copy the defconfig over so we can use the same name as w/ the Linaro kernel -->
@@ -52,56 +53,79 @@
   <!-- /project -->
 
   <!-- AOSP with Linaro additions -->
-  <project path="build" name="platform/build" revision="linaro_android_4.0.4">
+  <!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
+  <project path="build" name="platform/build" revision="linaro_android_4.1.1">
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
-  <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"/>
+  <!-- Linaro modifications: gcc 4.6+ -Werror support -->
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.1.1" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.1" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.1" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.1" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Integrate Linaro build system extras -->
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Added property to turn off hardware GFX -->
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: gcc 4.7 support -->
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.1"/>
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.1" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.1" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.1" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: support for non-prebuilt toolchain -->
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <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.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" />
+  <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Make it build with OpenJDK" -->
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Set CPU specific compiler flags -->
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Find omapfb.h -->
+  <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
+  <!-- Has Linaro modifications on 4.0.4 that may need porting -->
+  <project path="system/core" name="platform/system/core" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
+  <project path="system/vold" name="platform/system/vold" />
+  <project path="external/srec" name="platform/external/srec" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
+  <project path="external/freetype" name="platform/external/freetype" />
+  <project path="external/sonivox" name="platform/external/sonivox" />
+  <project path="external/openssl" name="platform/external/openssl" />
+  <project path="libcore" name="platform/libcore" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" />
+  <project path="external/llvm" name="platform/external/llvm" />
+  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
+  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" />
+  <project path="external/tremolo" name="platform/external/tremolo" />
+  <project path="external/skia" name="platform/external/skia" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+  <project path="cts" name="platform/cts" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
+  <project path="system/media" name="platform/system/media" />
+  <project path="external/chromium" name="platform/external/chromium" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
+  <project path="external/ping" name="platform/external/ping" />
+  <project path="external/ping6" name="platform/external/ping6" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" />
+  <project path="external/strace" name="platform/external/strace" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
+  <project path="external/webkit" name="platform/external/webkit" />
+  <project path="external/embunit" name="platform/external/embunit" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
+  <project path="external/libvpx" name="platform/external/libvpx" />
+  <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <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"/>
-  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.0.4" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.0.4" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.0.4" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.0.4" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
-  <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.0.4" />
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.0.4" />
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -113,7 +137,10 @@
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="development" name="platform/development" />
+  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
+  <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
+  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
   <project path="device/generic/goldfish" name="device/generic/goldfish" />
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
@@ -121,8 +148,8 @@
   <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/aac" name="platform/external/aac" />
   <project path="external/android-mock" name="platform/external/android-mock" />
   <project path="external/antlr" name="platform/external/antlr" />
   <project path="external/apache-harmony" name="platform/external/apache-harmony" />
@@ -135,13 +162,19 @@
   <project path="external/bouncycastle" name="platform/external/bouncycastle" />
   <project path="external/bsdiff" name="platform/external/bsdiff" />
   <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/collada" name="platform/external/collada" />
+  <project path="external/checkpolicy" name="platform/external/checkpolicy" />
+  <project path="external/chromium-trace" name="platform/external/chromium-trace" />
+  <project path="external/cibu-fonts" name="platform/external/cibu-fonts" />
+  <project path="exernal/compiler-rt" name="platform/external/compiler-rt" />
   <project path="external/dbus" name="platform/external/dbus" />
+  <project path="external/dexmaker" name="platform/external/dexmaker" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
   <project path="external/doclava" name="platform/external/doclava" />
   <project path="external/dropbear" name="platform/external/dropbear" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
   <project path="external/easymock" name="platform/external/easymock" />
+  <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
+  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -149,12 +182,14 @@
   <project path="external/fdlibm" name="platform/external/fdlibm" />
   <project path="external/flac" name="platform/external/flac" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
+  <project path="external/ganymed-ssh2" name="platform/external/ganymed-ssh2" />
+  <project path="external/gcc-demangle" name="platform/external/gcc-demangle" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
   <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" />
   <project path="external/grub" name="platform/external/grub" />
-  <project path="external/guava" name="platform/external/guava" />
   <project path="external/harfbuzz" name="platform/external/harfbuzz" />
+  <project path="external/hamcrest" name="platform/external/hamcrest" />
   <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" />
@@ -163,6 +198,8 @@
   <project path="external/javassist" name="platform/external/javassist" />
   <project path="external/jdiff" name="platform/external/jdiff" />
   <project path="external/jhead" name="platform/external/jhead" />
+  <project path="external/jmdns" name="platform/external/jmdns" />
+  <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" />
   <project path="external/jsilver" name="platform/external/jsilver" />
   <project path="external/jsr305" name="platform/external/jsr305" />
   <project path="external/junit" name="platform/external/junit" />
@@ -170,35 +207,47 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <project path="external/liblzf" name="platform/external/liblzf" />
+  <project path="external/libmtp" name="platform/external/libmtp" />
   <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
   <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/libselinux" name="platform/external/libselinux" />
+  <project path="external/libsepol" name="platform/external/libsepol" />
+  <project path="external/libusb" name="platform/external/libusb" />
+  <project path="external/libusb-compat" name="platform/external/libusb-compat" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
-  <project path="external/libyuv" name="platform/external/libyuv" remote="aosp-upstream" />
+  <project path="external/libyuv" name="platform/external/libyuv" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" />
+  <project path="external/littlemock" name="platform/external/littlemock" />
   <project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
   <project path="external/markdown" name="platform/external/markdown" />
+  <project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
   <project path="external/mesa3d" name="platform/external/mesa3d" />
   <project path="external/mksh" name="platform/external/mksh" />
   <project path="external/mockwebserver" name="platform/external/mockwebserver" />
   <project path="external/mtpd" name="platform/external/mtpd" />
+  <project path="external/naver-fonts" name="platform/external/naver-fonts" />
   <project path="external/netcat" name="platform/external/netcat" />
   <project path="external/netperf" name="platform/external/netperf" />
   <project path="external/neven" name="platform/external/neven" />
   <project path="external/nist-sip" name="platform/external/nist-sip" />
   <project path="external/oauth" name="platform/external/oauth" />
   <project path="external/opencv" name="platform/external/opencv" />
-  <project path="external/pcre" name="platform/external/pcre" />
+  <project path="external/openfst" name="platform/external/openfst" />
+  <project path="external/openssh" name="platform/external/openssh" />
   <project path="external/ppp" name="platform/external/ppp" />
   <project path="external/proguard" name="platform/external/proguard" />
   <project path="external/protobuf" name="platform/external/protobuf" />
   <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/regex-re2" name="platform/external/regex-re2" />
   <project path="external/replicaisland" name="platform/external/replicaisland" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
+  <project path="external/sepolicy" name="platform/external/sepolicy" />
+  <project path="external/smali" name="platform/external/smali" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srtp" name="platform/external/srtp" />
   <project path="external/svox" name="platform/external/svox" />
@@ -208,18 +257,23 @@
   <project path="external/valgrind" name="platform/external/valgrind" />
   <project path="external/webp" name="platform/external/webp" />
   <project path="external/webrtc" name="platform/external/webrtc" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <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="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
+  <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" />
+  <project path="frameworks/ml" name="platform/frameworks/ml" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
   <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" />
   <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" />
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/support" name="platform/frameworks/support" />
+  <project path="frameworks/testing" name="platform/frameworks/testing" />
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" />
+  <project path="gdk" name="platform/gdk" />
   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
   <project path="hardware/invensense" name="platform/hardware/invensense" />
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
@@ -227,6 +281,9 @@
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
   <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
+  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
+  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
+  <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
   <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
@@ -244,6 +301,7 @@
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
   <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
   <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
   <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
   <project path="packages/apps/Music" name="platform/packages/apps/Music" />
   <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
@@ -261,15 +319,14 @@
   <project path="packages/apps/VideoEditor" name="platform/packages/apps/VideoEditor" />
   <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
   <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
   <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" />
   <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" />
   <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" />
   <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" />
   <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" />
   <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" />
-  <project path="packages/providers/GoogleContactsProvider" name="platform/packages/providers/GoogleContactsProvider" />
   <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" />
+  <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" />
   <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" />
   <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" />
   <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" />
@@ -280,7 +337,29 @@
   <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
   <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" />
   <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" />
+  <project path="pdk" name="platform/pdk" />
   <project path="prebuilt" name="platform/prebuilt" />
+  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" />
+  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" />
+  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" />
+  <project path="prebuilts/gcc/darwin-x86/x86/i686-android-linux-4.4.3" name="platform/prebuilts/gcc/darwin-x86/x86/i686-android-linux-4.4.3" />
+  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" />
+  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" />
+  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" />
+  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" />
+  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" />
+  <project path="prebuilts/gcc/linux-x86/x86/i686-android-linux-4.4.3" name="platform/prebuilts/gcc/linux-x86/x86/i686-android-linux-4.4.3" />
+  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" />
+  <project path="prebuilts/misc" name="platform/prebuilts/misc" />
+  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" />
+  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" />
+  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" />
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-- 
cgit v1.2.3