summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2012-03-26 11:20:12 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2012-03-26 11:20:12 +0530
commit2d4a720036606eec14bdc72cc88008e1545a1cd7 (patch)
tree656e57e9c413a1be176b2cef5c7cc075a55a4192
parente952b9f8cf3d39949a4a7614adb5541d6822b3f7 (diff)
parent2ba9cf7435b6845ef089a4b7f53b3c5ba8d1f7e3 (diff)
downloadmanifest-2d4a720036606eec14bdc72cc88008e1545a1cd7.tar.gz
Merge remote-tracking branch 'remotes/origin/master' into linaro_android_master
-rw-r--r--default.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index 95b4f18e2..ff7e44aba 100644
--- a/default.xml
+++ b/default.xml
@@ -46,6 +46,7 @@
<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-clat" name="platform/external/android-clat" />
<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" />
@@ -71,6 +72,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-windowbuilder" name="platform/external/eclipse-windowbuilder" />
<project path="external/elfutils" name="platform/external/elfutils" />
<project path="external/embunit" name="platform/external/embunit" />
<project path="external/emma" name="platform/external/emma" />
@@ -255,6 +257,8 @@
<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/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/qemu-kernel" name="platform/prebuilts/qemu-kernel" />
<project path="prebuilts/tools" name="platform/prebuilts/tools" />
<project path="sdk" name="platform/sdk" />