Merge android13-5.10 into android13-gs-pixel-5.10-tm-qpr2

Merge SHA: 52e7aa3 FROMLIST: KVM: arm64: pkvm: Fixup boot mode to reflect that the kernel resumes from EL1 Bug: 255246572 Bug: 233587962 (ACK) Bug: 233588291 (ACK) Bug: 238728493 (ACK) Bug: 245674737 (ACK) Bug: 245812080 (ACK) Bug: 254608320 (ACK) Bug: 254837884 (ACK) Bug: 255159688 (ACK) Bug: 255471591 (ACK) Bug: 258157858 (ACK) Change-Id: Iad7e6ba0bf1701bd01fb477294c08c4a74b5f391 Signed-off-by: Joey Lin <[email protected]>
celtare21 · Nov 10, 2022 · dd230df · dd230df
2 parents 90a4995 + 52e7aa3
commit dd230df
Show file tree

Hide file tree

Showing 13 changed files with 990 additions and 16 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -32,6 +32,7 @@ _aarch64_additional_kmi_symbol_lists = [
     # keep sorted
     "android/abi_gki_aarch64_core",
     "android/abi_gki_aarch64_db845c",
+    "android/abi_gki_aarch64_exynos",
     "android/abi_gki_aarch64_fips140",
     "android/abi_gki_aarch64_generic",
     "android/abi_gki_aarch64_hikey960",

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml