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

Commit 5ff1f0a3 authored by Yifan Hong's avatar Yifan Hong
Browse files

Add System SDK Versions to VINTF. 

Add PLATFORM_SYSTEMSDK_VERSIONS to framework manifest
and BOARD_SYSTEMSDK_VERSIONS to device comp matrix.

Test: m framework_manifest.xml -j
Test: BOARD_SYSTEMSDK_VERSIONS=P m device_compatibility_matrix.xml -j

Bug: 69088799
Change-Id: I0b5ac6f1c2802c353b2989b017c1cdfc9fe27987
parent 9b8fc9e3

target/board/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ GEN := $(local-generated-sources-dir)/compatibility_matrix.xml 
$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)

$(GEN): $(DEVICE_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	REQUIRED_VNDK_VERSION=$(PRIVATE_VINTF_VNDK_VERSION) \

	BOARD_SYSTEMSDK_VERSIONS="$(BOARD_SYSTEMSDK_VERSIONS)" \

		$(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@



LOCAL_PREBUILT_MODULE_FILE := $(GEN)
@@ -103,6 +104,7 @@ $(GEN): PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES := $(FRAMEWORK_MANIFEST_INPUT_FIL 
$(GEN): $(FRAMEWORK_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \

	PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \

	PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \

		$(HOST_OUT_EXECUTABLES)/assemble_vintf \

		-i $(call normalize-path-list,$(PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES)) \

		-o $@ $(PRIVATE_FLAGS)