Browse Source

Merge from master

Change-Id: I4bf730aa31e8695ba381c306641d4f98f7506581
pull/3/head
Conley Owens 12 years ago
parent
commit
b4c9c2dff7
1 changed files with 6 additions and 3 deletions
  1. +6
    -3
      default.xml

+ 6
- 3
default.xml View File

@ -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" />


Loading…
Cancel
Save