am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"

* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
  Add x86 qemu
This commit is contained in:
David Turner
2011-03-25 15:51:22 -07:00
committed by Android Git Automerger

View File

@@ -71,10 +71,10 @@ external/clang/lib/Headers platforms/${PLATFORM_NAME}/renderscript/clang-i
external/clang/LICENSE.TXT platforms/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT
# System images + Kernel
system.img platforms/${PLATFORM_NAME}/images/system.img
ramdisk.img platforms/${PLATFORM_NAME}/images/ramdisk.img
userdata.img platforms/${PLATFORM_NAME}/images/userdata.img
prebuilt/android-arm/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/kernel-qemu
system.img platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/system.img
ramdisk.img platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/ramdisk.img
userdata.img platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/userdata.img
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
# emulator skins from sdk.git
#development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA