Browse Source

Merge from master

Change-Id: I0958c123291c4825727ec1945f7a0feead3c535d
pull/3/head
The Android Open Source Project 12 years ago
parent
commit
87ea75948d
1 changed files with 31 additions and 26 deletions
  1. +31
    -26
      default.xml

+ 31
- 26
default.xml View File

@ -19,24 +19,25 @@
<project path="cts" name="platform/cts" />
<project path="dalvik" name="platform/dalvik" />
<project path="development" name="platform/development" />
<project path="device/asus/grouper" name="device/asus/grouper" />
<project path="device/asus/grouper" name="device/asus/grouper" groups="device" />
<project path="device/common" name="device/common" />
<project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
<project path="device/generic/armv7-a" name="device/generic/armv7-a" />
<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/moto/common" name="device/moto/common" />
<project path="device/moto/stingray" name="device/moto/stingray" />
<project path="device/moto/wingray" name="device/moto/wingray" />
<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/google/phantasm" name="device/google/phantasm" groups="device" />
<project path="device/moto/common" name="device/moto/common" groups="device" />
<project path="device/moto/stingray" name="device/moto/stingray" groups="device" />
<project path="device/moto/wingray" name="device/moto/wingray" groups="device" />
<project path="device/sample" name="device/sample" />
<project path="device/samsung/crespo" name="device/samsung/crespo" />
<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="device/ti/panda" name="device/ti/panda" />
<project path="device/samsung/crespo" name="device/samsung/crespo" groups="device" />
<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/tuna" name="device/samsung/tuna" 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" />
<project path="external/android-clat" name="platform/external/android-clat" />
@ -47,6 +48,7 @@
<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" />
@ -142,6 +144,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/openssh" name="platform/external/openssh" />
@ -283,19 +286,19 @@
<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/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-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-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" />
<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" />
<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.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" />
<project path="prebuilts/ndk" name="platform/prebuilts/ndk" />
<project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" />
@ -309,5 +312,7 @@
<project path="system/netd" name="platform/system/netd" />
<project path="system/security" name="platform/system/security" />
<project path="system/vold" name="platform/system/vold" />
<project path="tools/build" name="platform/tools/build" groups="toolsbuild" />
<project path="tools/motodev" name="platform/tools/motodev" />
</manifest>

Loading…
Cancel
Save