Revert "Rectify KMI generation."
This reverts commit e43761e094b62607a58fc74af5aa9356f03434a0.
Reason for revert: b/187913647
Change-Id: I2a2ea877be4e5bc9fad472d30e6984c33da023a7
diff --git a/CleanSpec.mk b/CleanSpec.mk
index f235841..4c1985d 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -66,5 +66,3 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.health.storage@1.0-service.cuttlefish)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.health.storage@1.0-service.cuttlefish.rc)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/manifest_android.hardware.health.storage@1.0.cuttlefish.xml)
-
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/apex/com.android.gki.*)
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 0a61cf2..0ebb43a 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -254,16 +254,7 @@
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
endif
BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
-
-# TARGET_KERNEL_USE is defined in kernel.mk, if not defined in the environment variable.
-# Keep in sync with GKI APEX in device.mk
-ifneq (,$(TARGET_KERNEL_USE))
- ifneq (,$(filter 5.4, $(TARGET_KERNEL_USE)))
- BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := 5.4-android12-0
- else
- BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := $(TARGET_KERNEL_USE)-android12-unstable
- endif
-endif
+BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := 5.10-android12-1
BOARD_GENERIC_RAMDISK_KERNEL_MODULES_LOAD := dm-user.ko
diff --git a/shared/device.mk b/shared/device.mk
index 0cc0d3c..19ec788 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -579,14 +579,7 @@
android.hardware.memtrack-service.example
# GKI APEX
-# Keep in sync with BOARD_KERNEL_MODULE_INTERFACE_VERSIONS
-ifneq (,$(TARGET_KERNEL_USE))
- ifneq (,$(filter 5.4, $(TARGET_KERNEL_USE)))
- PRODUCT_PACKAGES += com.android.gki.kmi_5_4_android12_unstable
- else
- PRODUCT_PACKAGES += com.android.gki.kmi_$(subst .,_,$(TARGET_KERNEL_USE))_android12_unstable
- endif
-endif
+PRODUCT_PACKAGES += com.android.gki.kmi_5_10_android12_1
# Prevent GKI and boot image downgrades
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/vsoc_arm64/BoardConfig.mk b/vsoc_arm64/BoardConfig.mk
index bc016a8..96b042b 100644
--- a/vsoc_arm64/BoardConfig.mk
+++ b/vsoc_arm64/BoardConfig.mk
@@ -20,6 +20,9 @@
-include device/google/cuttlefish/shared/BoardConfig.mk
+# TARGET_KERNEL_USE is defined in kernel.mk, if not defined in the environment variable.
+BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := $(TARGET_KERNEL_USE)-android12-0
+
TARGET_BOARD_PLATFORM := vsoc_arm64
TARGET_ARCH := arm64
TARGET_ARCH_VARIANT := armv8-a
diff --git a/vsoc_x86_64/BoardConfig.mk b/vsoc_x86_64/BoardConfig.mk
index 52dde5c..8ce8c49 100644
--- a/vsoc_x86_64/BoardConfig.mk
+++ b/vsoc_x86_64/BoardConfig.mk
@@ -20,6 +20,9 @@
-include device/google/cuttlefish/shared/BoardConfig.mk
+# TARGET_KERNEL_USE is defined in kernel.mk, if not defined in the environment variable.
+BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := $(TARGET_KERNEL_USE)-android12-0
+
TARGET_BOARD_PLATFORM := vsoc_x86_64
TARGET_ARCH := x86_64
TARGET_ARCH_VARIANT := silvermont
diff --git a/vsoc_x86_only/BoardConfig.mk b/vsoc_x86_only/BoardConfig.mk
index 8703a10..286a7b8 100644
--- a/vsoc_x86_only/BoardConfig.mk
+++ b/vsoc_x86_only/BoardConfig.mk
@@ -20,6 +20,9 @@
-include device/google/cuttlefish/shared/BoardConfig.mk
+# TARGET_KERNEL_USE is defined in kernel.mk, if not defined in the environment variable.
+BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := $(TARGET_KERNEL_USE)-android12-0
+
TARGET_BOARD_PLATFORM := vsoc_x86
TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86
