Merge "emulator: enable 32bit x86 image to run on 64bit kernel"

This commit is contained in:
Treehugger Robot
2018-01-19 02:00:20 +00:00
committed by Gerrit Code Review

View File

@@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64
device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img
# version files for the SDK updater, from development.git # version files for the SDK updater, from development.git