Loading target/board/Android.mk +20 −1 Original line number Diff line number Diff line Loading @@ -114,9 +114,28 @@ $(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MANIFEST)" endif endif ifeq (true,$(BOARD_AVB_ENABLE)) $(GEN): $(AVBTOOL) # INTERNAL_AVB_SYSTEM_SIGNING_ARGS consists of BOARD_AVB_SYSTEM_KEY_PATH and # BOARD_AVB_SYSTEM_ALGORITHM. We should add the dependency of key path, which # is a file, here. $(GEN): $(BOARD_AVB_SYSTEM_KEY_PATH) # Use deferred assignment (=) instead of immediate assignment (:=). # Otherwise, cannot get INTERNAL_AVB_SYSTEM_SIGNING_ARGS. FRAMEWORK_VBMETA_VERSION = $$("$(AVBTOOL)" add_hashtree_footer \ --print_required_libavb_version \ $(INTERNAL_AVB_SYSTEM_SIGNING_ARGS) \ $(BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS)) else FRAMEWORK_VBMETA_VERSION := 0.0 endif $(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf # TODO(b/37405869) (b/37715375) inject avb versions as well for devices that have avb enabled. POLICYVERS=$(POLICYVERS) BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ $(PRIVATE_FLAGS) POLICYVERS=$(POLICYVERS) \ BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \ FRAMEWORK_VBMETA_VERSION=$(FRAMEWORK_VBMETA_VERSION) \ $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ $(PRIVATE_FLAGS) LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_SYSTEM_COMPATIBILITY_MATRIX := $(LOCAL_BUILT_MODULE) Loading
target/board/Android.mk +20 −1 Original line number Diff line number Diff line Loading @@ -114,9 +114,28 @@ $(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MANIFEST)" endif endif ifeq (true,$(BOARD_AVB_ENABLE)) $(GEN): $(AVBTOOL) # INTERNAL_AVB_SYSTEM_SIGNING_ARGS consists of BOARD_AVB_SYSTEM_KEY_PATH and # BOARD_AVB_SYSTEM_ALGORITHM. We should add the dependency of key path, which # is a file, here. $(GEN): $(BOARD_AVB_SYSTEM_KEY_PATH) # Use deferred assignment (=) instead of immediate assignment (:=). # Otherwise, cannot get INTERNAL_AVB_SYSTEM_SIGNING_ARGS. FRAMEWORK_VBMETA_VERSION = $$("$(AVBTOOL)" add_hashtree_footer \ --print_required_libavb_version \ $(INTERNAL_AVB_SYSTEM_SIGNING_ARGS) \ $(BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS)) else FRAMEWORK_VBMETA_VERSION := 0.0 endif $(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf # TODO(b/37405869) (b/37715375) inject avb versions as well for devices that have avb enabled. POLICYVERS=$(POLICYVERS) BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ $(PRIVATE_FLAGS) POLICYVERS=$(POLICYVERS) \ BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \ FRAMEWORK_VBMETA_VERSION=$(FRAMEWORK_VBMETA_VERSION) \ $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ $(PRIVATE_FLAGS) LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_SYSTEM_COMPATIBILITY_MATRIX := $(LOCAL_BUILT_MODULE)