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

Commit 87328762 authored by Yifan Hong's avatar Yifan Hong
Browse files

Move system manifest / device matrix build rules 

Test: build these files
Change-Id: I6467f4b7ce421358c30ad7a4c72a77dcc2ed3f88
parent a4c7d59a

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -837,12 +837,6 @@ else 
  DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey

endif



FRAMEWORK_MANIFEST_INPUT_FILES := system/libhidl/manifest.xml

ifdef DEVICE_FRAMEWORK_MANIFEST_FILE

  FRAMEWORK_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE)

endif

$(KATI_obsolete_var DEVICE_FRAMEWORK_MANIFEST_FILE,No one should ever need to use this.)



BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)

BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt)

target/board/Android.mk

+0 −62
Original line number Diff line number Diff line
@@ -52,65 +52,3 @@ LOCAL_PREBUILT_MODULE_FILE := $(GEN) 
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)

LOCAL_MODULE        := device_compatibility_matrix.xml

LOCAL_MODULE_STEM   := compatibility_matrix.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)/etc/vintf



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)

include $(BUILD_PREBUILT)

BUILT_VENDOR_MATRIX := $(LOCAL_BUILT_MODULE)

endif



# Framework Manifest

include $(CLEAR_VARS)

LOCAL_MODULE        := framework_manifest.xml

LOCAL_MODULE_STEM   := manifest.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT)/etc/vintf



GEN := $(local-generated-sources-dir)/manifest.xml



$(GEN): PRIVATE_FLAGS :=



ifeq ($(PRODUCT_ENFORCE_VINTF_MANIFEST),true)

ifdef BUILT_VENDOR_MATRIX

$(GEN): $(BUILT_VENDOR_MATRIX)

$(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) \

	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)



LOCAL_PREBUILT_MODULE_FILE := $(GEN)

include $(BUILD_PREBUILT)

BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE)



VINTF_VNDK_VERSION :=