From 3c1041fb223478436a6546bd06ff64781f4d731b Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 5 Aug 2020 14:33:58 -0700
Subject: [PATCH] Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS.

This is a list of KMI versions used to filter gki_apex modules. Only
gki_apex modules with kmi_version field that are in the list are created.

Test: build GKI APEXes
Bug: 162888350
Change-Id: I0f582f6ea200d52482fd4065c8f4f8b32efc4dee
---
 core/board_config.mk | 1 +
 core/soong_config.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/board_config.mk b/core/board_config.mk
index 43a34f92c..391e28055 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -94,6 +94,7 @@ _board_strip_readonly_list += $(_dynamic_partitions_var_list)
 # Kernel related variables
 _board_strip_readonly_list += \
   BOARD_KERNEL_BINARIES \
+  BOARD_KERNEL_MODULE_INTERFACE_VERSIONS \
 
 _build_broken_var_list := \
   BUILD_BROKEN_DUP_RULES \
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 98ab07dd9..01b355e89 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -217,6 +217,7 @@ $(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATT
 $(call add_json_bool, BoardUsesRecoveryAsBoot, $(BOARD_USES_RECOVERY_AS_BOOT))
 
 $(call add_json_list, BoardKernelBinaries, $(BOARD_KERNEL_BINARIES))
+$(call add_json_list, BoardKernelModuleInterfaceVersions, $(BOARD_KERNEL_MODULE_INTERFACE_VERSIONS))
 
 $(call json_end)