Merge "Update Android 13 GKI KMI symbol files and test" am: 125a88be13 am: bbd4d7988f am: 0483b67601

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

Change-Id: I2b969a4f65798ccc3d8322d5abe36d566a7ac846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

gki/kmi_abi_chk/kmi_compatibility_test.mk

@@ -20,35 +20,35 @@ KMI_CHK_SCRIPT := $(LOCAL_PATH)/kmi_compatibility_test.sh
 # The reason not to use the one under kernel/prebuilts/5.* by default
 # is because the KMI ABI may not be stable during development.
 #
-# Set CURR_5_4_SYMVERS/CURR_5_10_SYMVERS explicitly for the actual
+# Set CURR_5_15_SYMVERS/CURR_5_10_SYMVERS explicitly for the actual
 # current kernel symbol file to be checked. E.g.,
 # $ m CURR_5_10_SYMVERS=kernel/prebuilts/5.10/arm64/vmlinux.symvers \
 #     gki_5_10_kmi_compatibility_test
-CURR_5_4_SYMVERS ?= development/gki/kmi_abi_chk/sym-5.4/Module.symvers
+CURR_5_15_SYMVERS ?= development/gki/kmi_abi_chk/sym-5.15/vmlinux.symvers
 CURR_5_10_SYMVERS ?= development/gki/kmi_abi_chk/sym-5.10/vmlinux.symvers
 
 # Previous kernel symbol files, against which the latest one is checked
 # The file names of previous kernel symbol files are of this form:
 #     *.symvers-$(BID)
 # Here *.symvers is a symbolic link to the latest build.
-PREV_5_4_SYMVERS := $(LOCAL_PATH)/sym-5.4/Module.symvers
+PREV_5_15_SYMVERS := $(LOCAL_PATH)/sym-5.15/vmlinux.symvers
 PREV_5_10_SYMVERS := $(LOCAL_PATH)/sym-5.10/vmlinux.symvers
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := gki_5_4_kmi_compatibility_test
+LOCAL_MODULE := a13_5_15_kmi_compatibility_test
 LOCAL_MODULE_CLASS := FAKE
 LOCAL_MODULE_TAGS := optional
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_SYSTEM)/base_rules.mk
 
-$(LOCAL_BUILT_MODULE): $(KMI_CHK_SCRIPT) $(CURR_5_4_SYMVERS) $(PREV_5_4_SYMVERS)
+$(LOCAL_BUILT_MODULE): $(KMI_CHK_SCRIPT) $(CURR_5_15_SYMVERS) $(PREV_5_15_SYMVERS)
 	@mkdir -p $(dir $@)
-	$(hide) $(KMI_CHK_SCRIPT) $(CURR_5_4_SYMVERS) $(PREV_5_4_SYMVERS)
+	$(hide) $(KMI_CHK_SCRIPT) $(CURR_5_15_SYMVERS) $(PREV_5_15_SYMVERS)
 	$(hide) touch $@
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := gki_5_10_kmi_compatibility_test
+LOCAL_MODULE := a13_5_10_kmi_compatibility_test
 LOCAL_MODULE_CLASS := FAKE
 LOCAL_MODULE_TAGS := optional
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
@@ -61,8 +61,8 @@ $(LOCAL_BUILT_MODULE): $(KMI_CHK_SCRIPT) $(CURR_5_10_SYMVERS) $(PREV_5_10_SYMVER
 	$(hide) touch $@
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := gki_kmi_compatibility_test
-LOCAL_REQUIRED_MODULES := gki_5_4_kmi_compatibility_test gki_5_10_kmi_compatibility_test
+LOCAL_MODULE := a13_kmi_compatibility_test
+LOCAL_REQUIRED_MODULES := a13_5_15_kmi_compatibility_test a13_5_10_kmi_compatibility_test
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_PHONY_PACKAGE)

gki/kmi_abi_chk/sym-5.10/vmlinux.symvers

@@ -1 +1 @@
-vmlinux.symvers-7833008
+vmlinux.symvers-8771756

gki/kmi_abi_chk/sym-5.15/vmlinux.symvers

@@ -0,0 +1 @@
+vmlinux.symvers-8747247

gki/kmi_abi_chk/sym-5.4/Module.symvers

@@ -1 +0,0 @@
-Module.symvers-7855344