diff options
| author | Yifan Hong <elsk@google.com> | 2018-01-23 15:38:49 -0800 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2018-01-23 17:28:27 -0800 |
| commit | 94b7d2ca19e816ccc68aba11d91e0bf54bf5fc86 (patch) | |
| tree | 173be2de748a9ac732bd9f5d970bdc6dcc2486c0 /compatibility_matrices | |
| parent | 44c9b2e1f4b26e334ced156f7ecd41adbcb81923 (diff) | |
| download | platform_hardware_interfaces-94b7d2ca19e816ccc68aba11d91e0bf54bf5fc86.tar.gz platform_hardware_interfaces-94b7d2ca19e816ccc68aba11d91e0bf54bf5fc86.tar.bz2 platform_hardware_interfaces-94b7d2ca19e816ccc68aba11d91e0bf54bf5fc86.zip | |
Compatibility matrices: add minor revision to kernel versions
Test: builds
Bug: 72388844
Change-Id: Id60cef10610f39d70eebccbeb6e625e3d93795c6
Diffstat (limited to 'compatibility_matrices')
| -rw-r--r-- | compatibility_matrices/Android.mk | 8 | ||||
| -rw-r--r-- | compatibility_matrices/compatibility_matrix.mk | 17 |
2 files changed, 19 insertions, 6 deletions
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index e876b3d10f..1c86f11081 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -31,19 +31,19 @@ LOCAL_GEN_FILE_DEPENDENCIES := include $(CLEAR_VARS) LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) -LOCAL_KERNEL_VERSIONS := 3.18 4.4 4.9 +LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) include $(CLEAR_VARS) LOCAL_MODULE_STEM := compatibility_matrix.1.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) -LOCAL_KERNEL_VERSIONS := 3.18 4.4 4.9 +LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) include $(CLEAR_VARS) LOCAL_MODULE_STEM := compatibility_matrix.2.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) -LOCAL_KERNEL_VERSIONS := 3.18 4.4 4.9 +LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) # TODO(b/72409164): STOPSHIP: update kernel version requirements @@ -51,7 +51,7 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) include $(CLEAR_VARS) LOCAL_MODULE_STEM := compatibility_matrix.current.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) -LOCAL_KERNEL_VERSIONS := 4.4 4.9 +LOCAL_KERNEL_VERSIONS := 4.4.0 4.9.0 include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) # Framework Compatibility Matrix (common to all FCM versions) diff --git a/compatibility_matrices/compatibility_matrix.mk b/compatibility_matrices/compatibility_matrix.mk index 90713d49db..14c60ab972 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 @@ ifneq (,$(strip $(LOCAL_KERNEL_VERSIONS))) $(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 @@ LOCAL_GEN_FILE_DEPENDENCIES := my_matrix_src_files := include $(BUILD_PREBUILT) + +remove-minor-revision := |