am a67b557e: Merge "Add RS includes to the SDK and update skin list." into honeycomb

* commit 'a67b557e13a11afc84beed873c7be4f2fac59643':
  Add RS includes to the SDK and update skin list.
This commit is contained in:
Xavier Ducrohet
2011-01-16 19:18:16 -08:00
committed by Android Git Automerger

View File

@@ -66,6 +66,9 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar pla
# the aidl precompiled include
obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
# Framework include for Renderscript
frameworks/base/libs/rs/scriptc platforms/${PLATFORM_NAME}/renderscript/include
# System images + Kernel
system.img platforms/${PLATFORM_NAME}/images/system.img
ramdisk.img platforms/${PLATFORM_NAME}/images/ramdisk.img
@@ -73,12 +76,12 @@ userdata.img platforms/${PLATFORM_NAME}/images/userda
prebuilt/android-arm/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/kernel-qemu
# emulator skins from sdk.git
development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA
development/tools/emulator/skins/WQVGA432 platforms/${PLATFORM_NAME}/skins/WQVGA432
development/tools/emulator/skins/WQVGA400 platforms/${PLATFORM_NAME}/skins/WQVGA400
development/tools/emulator/skins/HVGA platforms/${PLATFORM_NAME}/skins/HVGA
development/tools/emulator/skins/WVGA800 platforms/${PLATFORM_NAME}/skins/WVGA800
development/tools/emulator/skins/WVGA854 platforms/${PLATFORM_NAME}/skins/WVGA854
#development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA
#development/tools/emulator/skins/WQVGA432 platforms/${PLATFORM_NAME}/skins/WQVGA432
#development/tools/emulator/skins/WQVGA400 platforms/${PLATFORM_NAME}/skins/WQVGA400
#development/tools/emulator/skins/HVGA platforms/${PLATFORM_NAME}/skins/HVGA
#development/tools/emulator/skins/WVGA800 platforms/${PLATFORM_NAME}/skins/WVGA800
#development/tools/emulator/skins/WVGA854 platforms/${PLATFORM_NAME}/skins/WVGA854
development/tools/emulator/skins/WXGA platforms/${PLATFORM_NAME}/skins/WXGA
# Platform SDK properties