Merge "emulator: 64-bit kernel for 32-bit arm image" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
6fb5c38bdd
@@ -15,7 +15,7 @@
|
||||
#
|
||||
|
||||
# Copy the ARMv7 specific kernel image to .../kernel-qemu
|
||||
prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
|
||||
prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64
|
||||
|
||||
# version files for the SDK updater, from development.git
|
||||
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#
|
||||
|
||||
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
|
||||
prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
|
||||
prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64
|
||||
|
||||
# version files for the SDK updater, from development.git
|
||||
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
|
||||
|
||||
Reference in New Issue
Block a user