Merge "add <vendor-ndk> to VINTF." (3fbfab78) · Commits · e / os / android_build

target/board/Android.mk

+16 −3

Original line number	Diff line number	Diff line
		@@ -53,6 +53,13 @@ include $(BUILD_PREBUILT)
		BUILT_VENDOR_MANIFEST := $(LOCAL_BUILT_MODULE)
		endif

		# VNDK Version in device compatibility matrix and framework manifest
		ifeq ($(BOARD_VNDK_VERSION),current)
		VINTF_VNDK_VERSION := $(PLATFORM_VNDK_VERSION)
		else
		VINTF_VNDK_VERSION := $(BOARD_VNDK_VERSION)
		endif

		# Device Compatibility Matrix
		ifdef DEVICE_MATRIX_FILE
		include $(CLEAR_VARS)
		@@ -62,8 +69,10 @@ LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)

		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
		# TODO(b/37342627): put BOARD_VNDK_VERSION & BOARD_VNDK_LIBRARIES into device matrix.
		REQUIRED_VNDK_VERSION=$(PRIVATE_VINTF_VNDK_VERSION) \
		$(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@

		LOCAL_PREBUILT_MODULE_FILE := $(GEN)
		@@ -89,9 +98,12 @@ $(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MATRIX)"
		endif
		endif

		$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
		$(GEN): PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES := $(FRAMEWORK_MANIFEST_INPUT_FILES)
		$(GEN): $(FRAMEWORK_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
		BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf \
		BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \
		PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \
		$(HOST_OUT_EXECUTABLES)/assemble_vintf \
		-i $(call normalize-path-list,$(PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES)) \
		-o $@ $(PRIVATE_FLAGS)

		@@ -99,3 +111,4 @@ LOCAL_PREBUILT_MODULE_FILE := $(GEN)
		include $(BUILD_PREBUILT)
		BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE)

		VINTF_VNDK_VERSION :=