Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I601c18dace2fb4a55b277d704864a0e15b68035a
This commit is contained in:
Treehugger Robot
2021-02-05 17:50:06 +00:00
committed by Automerger Merge Worker
3 changed files with 3 additions and 3 deletions

View File

@@ -14,7 +14,7 @@
# limitations under the License.
#
prebuilts/qemu-kernel/${TARGET_ARCH}/5.10/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
kernel/prebuilts/5.10/arm64/kernel-5.10-lz4 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
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

View File

@@ -14,7 +14,7 @@
# limitations under the License.
#
prebuilts/qemu-kernel/x86_64/5.10/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64
kernel/prebuilts/5.10/x86_64/kernel-5.10 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
# version files for the SDK updater, from development.git

View File

@@ -14,7 +14,7 @@
# limitations under the License.
#
prebuilts/qemu-kernel/${TARGET_ARCH}/5.10/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
kernel/prebuilts/5.10/x86_64/kernel-5.10 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
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