diff options
| author | Conley Owens <cco3@android.com> | 2012-10-26 10:02:08 -0700 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2012-10-26 10:02:22 -0700 |
| commit | b4c9c2dff77e38ebca9efa7acce819ec80b14480 (patch) | |
| tree | c53849d7f2484e89452b2635d30c211cd7afb987 | |
| parent | 87ea75948da70b18f0664ba6c1f11a381e3c36f5 (diff) | |
| parent | f46b8df32efc4979bdca52bf52e83fd816819f60 (diff) | |
| download | manifest-b4c9c2dff77e38ebca9efa7acce819ec80b14480.tar.gz | |
Merge from master
Change-Id: I4bf730aa31e8695ba381c306641d4f98f7506581
| -rw-r--r-- | default.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/default.xml b/default.xml index 504c61daf..1a77ac37b 100644 --- a/default.xml +++ b/default.xml @@ -35,8 +35,9 @@ <project path="device/samsung/crespo4g" name="device/samsung/crespo4g" groups="device" /> <project path="device/samsung/maguro" name="device/samsung/maguro" groups="device" /> <project path="device/samsung/toro" name="device/samsung/toro" groups="device" /> - <project path="device/samsung/torospr" name="device/samsung/torospr" groups="device" /> + <project path="device/samsung/toroplus" name="device/samsung/toroplus" groups="device" /> <project path="device/samsung/tuna" name="device/samsung/tuna" groups="device" /> + <project path="device/sony/lt26" name="device/sony/lt26" groups="device" /> <project path="device/ti/panda" name="device/ti/panda" groups="device" /> <project path="docs/source.android.com" name="platform/docs/source.android.com" /> <project path="external/aac" name="platform/external/aac" /> @@ -80,6 +81,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/freetype" name="platform/external/freetype" /> @@ -212,6 +214,7 @@ <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/akm" name="platform/hardware/akm" /> <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" /> <project path="hardware/invensense" name="platform/hardware/invensense" /> <project path="hardware/libhardware" name="platform/hardware/libhardware" /> @@ -286,9 +289,10 @@ <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" /> <project path="pdk" name="platform/pdk" /> <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" /> + <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.4.3" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" groups="darwin,mips" /> <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" /> @@ -296,7 +300,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" 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.4.3" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" groups="linux,mips" /> <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" /> |