summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2012-05-14 17:22:47 +0000
committerVishal Bhoj <vishal.bhoj@linaro.org>2012-05-14 17:27:38 +0000
commitbacff59f07e0cf1fc42ad5aaef5d9d766c1b39d8 (patch)
treecae02854c6a4ca1263f4e4722ef1bc150d8f70ec
parent2d4a720036606eec14bdc72cc88008e1545a1cd7 (diff)
parent03fc9565bbe48f8a74cb8333f31febf8f228b138 (diff)
downloadmanifest-bacff59f07e0cf1fc42ad5aaef5d9d766c1b39d8.tar.gz
Merge remote branch 'remotes/origin/master' into linaro_master
-rw-r--r--default.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index ff7e44aba..2c945e614 100644
--- a/default.xml
+++ b/default.xml
@@ -44,6 +44,7 @@
<project path="device/samsung/crespo4g" name="device/samsung/crespo4g" />
<project path="device/samsung/maguro" name="device/samsung/maguro" />
<project path="device/samsung/toro" name="device/samsung/toro" />
+ <project path="device/samsung/torospr" name="device/samsung/torospr" />
<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-clat" name="platform/external/android-clat" />
@@ -62,6 +63,7 @@
<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/checkpolicy" name="platform/external/checkpolicy" />
<project path="external/chromium" name="platform/external/chromium" />
<project path="external/clang" name="platform/external/clang" />
<project path="external/collada" name="platform/external/collada" />
@@ -72,6 +74,7 @@
<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/elfutils" name="platform/external/elfutils" />
<project path="external/embunit" name="platform/external/embunit" />
@@ -257,8 +260,20 @@
<project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" />
<project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" />
<project path="prebuilt" name="platform/prebuilt" />
+ <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" />
+ <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-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.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/qemu-kernel" name="platform/prebuilts/qemu-kernel" />
<project path="prebuilts/tools" name="platform/prebuilts/tools" />
<project path="sdk" name="platform/sdk" />