manifest: staging-vexpress-tc2-isw.xml: 4.2 bits

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

1 files changed, 105 insertions, 80 deletions

diff --git a/staging-vexpress-tc2-isw.xml b/staging-vexpress-tc2-isw.xml
index 12005a3..1fd112b 100644
--- a/staging-vexpress-tc2-isw.xml
+++ b/staging-vexpress-tc2-isw.xml
@@ -12,7 +12,7 @@
            fetch="ssh://linaro-big-little-switcher-bot@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.1_r6"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -69,90 +69,94 @@
   <!-- AOSP with Linaro additions -->
 
   <!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
-  <project path="build" name="platform/build" revision="linaro_android_4.1.1">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
   <!-- 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" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
-  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.1.1" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.1" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.1" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.1" />
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support -->
-  <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" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.1" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- 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" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
   <!-- 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" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.1" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
 
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.1" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.1" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.1" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.1" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
-  <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="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
-  <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/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="development" name="platform/development" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- 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/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
   <!-- 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/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.1" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.1" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
+  <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
   <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"/>
@@ -166,30 +170,34 @@
   <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="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/common" name="device/generic/common" remote="aosp-upstream" />
   <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" />
+  <project path="device/generic/mips" name="device/generic/mips" remote="aosp-upstream" />
+  <project path="device/generic/x86" name="device/generic/x86" remote="aosp-upstream" />
+  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
+  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
   <project path="device/samsung/maguro" name="device/samsung/maguro" />
   <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
+  <project path="external/android-clat" name="platform/external/android-clat" />
   <project path="external/android-mock" name="platform/external/android-mock" />
+  <project path="external/ant-glob" name="platform/external/ant-glob" />
   <project path="external/antlr" name="platform/external/antlr" />
   <project path="external/apache-harmony" name="platform/external/apache-harmony" />
   <project path="external/apache-http" name="platform/external/apache-http" />
+  <project path="external/apache-qp" name="platform/external/apache-qp" />
   <project path="external/apache-xml" name="platform/external/apache-xml" />
+  <project path="external/arduino" name="platform/external/arduino" />
   <project path="external/astl" name="platform/external/astl" />
   <project path="external/bison" name="platform/external/bison" />
   <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
+  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" remote="aosp-upstream" />
   <project path="external/bouncycastle" name="platform/external/bouncycastle" />
   <project path="external/bsdiff" name="platform/external/bsdiff" />
   <project path="external/bzip2" name="platform/external/bzip2" />
@@ -209,6 +217,7 @@
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
   <project path="external/eyes-free" name="platform/external/eyes-free" />
+  <project path="external/fat32lib" name="platform/external/fat32lib" />
   <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" />
@@ -221,9 +230,11 @@
   <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/icu4c" name="platform/external/icu4c" />
   <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/jack" name="platform/external/jack" />
   <project path="external/javasqlite" name="platform/external/javasqlite" />
   <project path="external/javassist" name="platform/external/javassist" />
   <project path="external/jdiff" name="platform/external/jdiff" />
@@ -234,29 +245,34 @@
   <project path="external/jsr305" name="platform/external/jsr305" />
   <project path="external/junit" name="platform/external/junit" />
   <project path="external/kernel-headers" name="platform/external/kernel-headers" />
+  <project path="external/libcap-ng" name="platform/external/libcap-ng" remote="aosp-upstream" />
   <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-nci" name="platform/external/libnfc-nci" remote="aosp-upstream" />
   <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
   <project path="external/libnl-headers" name="platform/external/libnl-headers" />
+  <project path="external/libogg" name="platform/external/libogg" remote="aosp-upstream" />
   <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/libppp" name="platform/external/libppp" remote="aosp-upstream" />
   <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/libvorbis" name="platform/external/libvorbis" remote="aosp-upstream" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/libyuv" name="platform/external/libyuv" />
   <project path="external/littlemock" name="platform/external/littlemock" />
-  <project path="external/llvm" name="platform/external/llvm" />
   <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/mksh" name="platform/external/mksh" />
   <project path="external/mockwebserver" name="platform/external/mockwebserver" />
+  <project path="external/mp4parser" name="platform/external/mp4parser" remote="aosp-upstream" />
   <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" />
@@ -264,6 +280,7 @@
   <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/okhttp" name="platform/external/okhttp" />
   <project path="external/opencv" name="platform/external/opencv" />
   <project path="external/openfst" name="platform/external/openfst" />
   <project path="external/ppp" name="platform/external/ppp" />
@@ -283,31 +300,33 @@
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tinyalsa" name="platform/external/tinyalsa"  />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
+  <project path="external/tinyxml2" name="platform/external/tinyxml2" remote="aosp-upstream" />
   <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_6" name="platform/external/wpa_supplicant_6" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
+  <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" remote="aosp-upstream" />
   <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" />
   <project path="frameworks/ml" name="platform/frameworks/ml" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
+  <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" />
   <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/mms" name="platform/frameworks/opt/mms" />
+  <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" remote="aosp-upstream" />
+  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" />
   <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="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" />
-  <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
-  <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
   <project path="hardware/ril" name="platform/hardware/ril" />
+  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" remote="aosp-upstream" />
   <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" />
@@ -338,6 +357,7 @@
   <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
   <project path="packages/apps/Provision" name="platform/packages/apps/Provision" />
   <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
+  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
   <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
   <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" />
   <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
@@ -356,6 +376,9 @@
   <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/screensavers/Basic" name="platform/packages/screensavers/Basic" remote="aosp-upstream" />
+  <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" remote="aosp-upstream" />
+  <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" remote="aosp-upstream" />
   <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" />
   <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" />
   <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" />
@@ -365,23 +388,24 @@
   <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/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="darwin" remote="aosp-upstream" />
+  <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="darwin" remote="aosp-upstream" />
+  <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="linux" remote="aosp-upstream" />
+  <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="linux" remote="aosp-upstream" />
   <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/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" />
+  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" groups="darwin,arm" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" groups="darwin,arm" />
+  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" groups="darwin,mips" />
+  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" groups="darwin,x86" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" groups="linux,arm" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" groups="linux,arm" />
+  <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" groups="linux" />
+  <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" groups="linux" />
+  <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" groups="linux" />
+  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" groups="linux,mips" />
+  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" groups="linux,x86" />
   <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" />
@@ -390,5 +414,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/netd" name="platform/system/netd" />
-
+  <project path="tools/build" name="platform/tools/build" groups="toolsbuild" />
+  <project path="tools/motodev" name="platform/tools/motodev" />
 </manifest>