Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38d8d80b authored Aug 14, 2018 by Yifan Hong Committed by Gerrit Code Review Aug 14, 2018

Merge "Allow OTA package to contain fake AVB version"

parents 72eefd5c 53891ac2

compatibility_matrices/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -128,13 +128,14 @@ LOCAL_MODULE := framework_compatibility_matrix.xml
		LOCAL_REQUIRED_MODULES := $(my_system_matrix_deps)
		include $(BUILD_PHONY_PACKAGE)

		# Final Framework Compatibility Matrix
		# Final Framework Compatibility Matrix for OTA
		include $(CLEAR_VARS)
		include $(LOCAL_PATH)/clear_vars.mk
		LOCAL_MODULE := verified_assembled_system_matrix.xml
		LOCAL_MODULE_PATH := $(PRODUCT_OUT)
		LOCAL_REQUIRED_MODULES := $(my_system_matrix_deps)
		LOCAL_GENERATED_SOURCES := $(call module-installed-files,$(LOCAL_REQUIRED_MODULES))
		LOCAL_ADD_VBMETA_VERSION_OVERRIDE := true

		ifdef BUILT_VENDOR_MANIFEST
		LOCAL_GEN_FILE_DEPENDENCIES += $(BUILT_VENDOR_MANIFEST)

compatibility_matrices/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		# Clear input variables to BUILD_FRAMEWORK_COMPATIBILITY_MATRIX
		LOCAL_ADD_VBMETA_VERSION :=
		LOCAL_ADD_VBMETA_VERSION_OVERRIDE :=
		LOCAL_ASSEMBLE_VINTF_ENV_VARS :=
		LOCAL_ASSEMBLE_VINTF_ENV_VARS_OVERRIDE :=
		LOCAL_ASSEMBLE_VINTF_ERROR_MESSAGE :=

compatibility_matrices/compatibility_matrix.mk

+7 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,13 @@ endif # BOARD_AVB_ENABLE
		$(GEN): PRIVATE_ENV_VARS += FRAMEWORK_VBMETA_VERSION
		endif # LOCAL_ADD_VBMETA_VERSION

		ifeq (true,$(strip $(LOCAL_ADD_VBMETA_VERSION_OVERRIDE)))
		ifneq ($(BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE),)
		$(GEN): FRAMEWORK_VBMETA_VERSION_OVERRIDE := $(BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE)
		$(GEN): PRIVATE_ENV_VARS += FRAMEWORK_VBMETA_VERSION_OVERRIDE
		endif
		endif

		ifneq (,$(strip $(LOCAL_KERNEL_CONFIG_DATA_PATHS)))
		$(GEN): PRIVATE_KERNEL_CONFIG_DATA_PATHS := $(LOCAL_KERNEL_CONFIG_DATA_PATHS)
		$(GEN): $(foreach pair,$(PRIVATE_KERNEL_CONFIG_DATA_PATHS),\