LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Switch emulator to 5.10 kernel (GKI 2.0)" am: 89e83dc8ec

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1534263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61aed680909a2f17ad8a912f76dd6ffe1fc6b455
This commit is contained in:
Treehugger Robot
2020-12-22 03:05:42 +00:00
committed by Automerger Merge Worker
parent ab5332ac88 89e83dc8ec
commit cad76386c4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/sdk-android-arm64-v8a.atree
View File

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

2
build/sdk-android-x86.atree
View File

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

2
build/sdk-android-x86_64.atree
View File

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