Merge "emulator: use 5.4 for sdk_phone_arm64" am: 9fe3e4f5b2 am: db1c1eee8f am: ae2eebd8be

Original change: https://android-review.googlesource.com/c/platform/development/+/1494658

Change-Id: I5bba9e752183d83b33bb9ba61bfaaf3c1d845860
This commit is contained in:
Treehugger Robot
2020-11-11 00:03:34 +00:00
committed by Automerger Merge Worker

View File

@@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
prebuilts/qemu-kernel/${TARGET_ARCH}/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu prebuilts/qemu-kernel/${TARGET_ARCH}/5.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
# version files for the SDK updater, from development.git # version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties