Compatibility matrices: add minor revision to kernel versions
Test: builds
Bug: 72388844
Change-Id: Id60cef10610f39d70eebccbeb6e625e3d93795c6
diff --git a/compatibility_matrices/compatibility_matrix.mk b/compatibility_matrices/compatibility_matrix.mk
index 90713d4..14c60ab 100644
--- a/compatibility_matrices/compatibility_matrix.mk
+++ b/compatibility_matrices/compatibility_matrix.mk
@@ -14,6 +14,17 @@
# limitations under the License.
#
+###########################################################
+## Remove minor revision from a kernel version. For example,
+## 3.18.0 becomes 3.18.
+## $(1): kernel version
+###########################################################
+define remove-minor-revision
+$(strip $(subst $(space),.,$(wordlist 1,2,$(subst .,$(space),$(strip $(1))))))
+endef
+
+# $(warning $(call remove-minor-revision,3.18.0))
+
ifndef LOCAL_MODULE_STEM
$(error LOCAL_MODULE_STEM must be defined.)
endif
@@ -55,10 +66,10 @@
$(GEN): PRIVATE_KERNEL_CONFIG_DATA := kernel/configs
$(GEN): PRIVATE_KERNEL_VERSIONS := $(LOCAL_KERNEL_VERSIONS)
$(GEN): $(foreach version,$(PRIVATE_KERNEL_VERSIONS),\
- $(wildcard $(PRIVATE_KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg))
+ $(wildcard $(PRIVATE_KERNEL_CONFIG_DATA)/android-$(call remove-minor-revision,$(version))/android-base*.cfg))
$(GEN): PRIVATE_FLAGS += $(foreach version,$(PRIVATE_KERNEL_VERSIONS),\
--kernel=$(version):$(call normalize-path-list,\
- $(wildcard $(PRIVATE_KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg)))
+ $(wildcard $(PRIVATE_KERNEL_CONFIG_DATA)/android-$(call remove-minor-revision,$(version))/android-base*.cfg)))
endif
my_matrix_src_files := \
@@ -85,3 +96,5 @@
my_matrix_src_files :=
include $(BUILD_PREBUILT)
+
+remove-minor-revision :=