Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility matrices: add minor revision to kernel versions

Browse Source 
Test: builds
Bug: 72388844
Change-Id: Id60cef10610f39d70eebccbeb6e625e3d93795c6
This commit is contained in:
Yifan Hong
2018-01-23 15:38:49 -08:00
parent 44c9b2e1f4
commit 94b7d2ca19
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compatibility_matrices/Android.mk
View File

@@ -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)

17
compatibility_matrices/compatibility_matrix.mk
View File

@@ -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 :=