Loading core/config.mk +0 −2 Original line number Diff line number Diff line Loading @@ -825,8 +825,6 @@ ifdef DEVICE_FRAMEWORK_MANIFEST_FILE endif $(.KATI_obsolete_var DEVICE_FRAMEWORK_MANIFEST_FILE,No one should ever need to use this.) FRAMEWORK_COMPATIBILITY_MATRIX_FILES := $(wildcard hardware/interfaces/compatibility_matrix.*.xml) BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt) BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt) Loading target/board/Android.mk +0 −57 Original line number Diff line number Diff line Loading @@ -99,60 +99,3 @@ LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE) # Framework Compatibility Matrix include $(CLEAR_VARS) LOCAL_MODULE := framework_compatibility_matrix.xml LOCAL_MODULE_STEM := compatibility_matrix.xml LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT) GEN := $(local-generated-sources-dir)/compatibility_matrix.xml $(GEN): PRIVATE_FLAGS := ifdef BUILT_VENDOR_MANIFEST $(GEN): $(BUILT_VENDOR_MANIFEST) $(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)" 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 # All kernel versions that the system image works with. KERNEL_VERSIONS := 3.18 4.4 4.9 KERNEL_CONFIG_DATA := kernel/configs $(GEN): $(foreach version,$(KERNEL_VERSIONS),\ $(wildcard $(KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg)) $(GEN): PRIVATE_FLAGS += $(foreach version,$(KERNEL_VERSIONS),\ --kernel=$(version):$(call normalize-path-list,\ $(wildcard $(KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg))) KERNEL_VERSIONS := KERNEL_CONFIG_DATA := $(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILES) $(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) \ FRAMEWORK_VBMETA_VERSION=$(FRAMEWORK_VBMETA_VERSION) \ PRODUCT_ENFORCE_VINTF_MANIFEST=$(PRODUCT_ENFORCE_VINTF_MANIFEST) \ $(HOST_OUT_EXECUTABLES)/assemble_vintf \ -i $(call normalize-path-list,$(FRAMEWORK_COMPATIBILITY_MATRIX_FILES)) \ -o $@ $(PRIVATE_FLAGS) LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_SYSTEM_COMPATIBILITY_MATRIX := $(LOCAL_BUILT_MODULE) Loading
core/config.mk +0 −2 Original line number Diff line number Diff line Loading @@ -825,8 +825,6 @@ ifdef DEVICE_FRAMEWORK_MANIFEST_FILE endif $(.KATI_obsolete_var DEVICE_FRAMEWORK_MANIFEST_FILE,No one should ever need to use this.) FRAMEWORK_COMPATIBILITY_MATRIX_FILES := $(wildcard hardware/interfaces/compatibility_matrix.*.xml) BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt) BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt) Loading
target/board/Android.mk +0 −57 Original line number Diff line number Diff line Loading @@ -99,60 +99,3 @@ LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE) # Framework Compatibility Matrix include $(CLEAR_VARS) LOCAL_MODULE := framework_compatibility_matrix.xml LOCAL_MODULE_STEM := compatibility_matrix.xml LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT) GEN := $(local-generated-sources-dir)/compatibility_matrix.xml $(GEN): PRIVATE_FLAGS := ifdef BUILT_VENDOR_MANIFEST $(GEN): $(BUILT_VENDOR_MANIFEST) $(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)" 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 # All kernel versions that the system image works with. KERNEL_VERSIONS := 3.18 4.4 4.9 KERNEL_CONFIG_DATA := kernel/configs $(GEN): $(foreach version,$(KERNEL_VERSIONS),\ $(wildcard $(KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg)) $(GEN): PRIVATE_FLAGS += $(foreach version,$(KERNEL_VERSIONS),\ --kernel=$(version):$(call normalize-path-list,\ $(wildcard $(KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg))) KERNEL_VERSIONS := KERNEL_CONFIG_DATA := $(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILES) $(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) \ FRAMEWORK_VBMETA_VERSION=$(FRAMEWORK_VBMETA_VERSION) \ PRODUCT_ENFORCE_VINTF_MANIFEST=$(PRODUCT_ENFORCE_VINTF_MANIFEST) \ $(HOST_OUT_EXECUTABLES)/assemble_vintf \ -i $(call normalize-path-list,$(FRAMEWORK_COMPATIBILITY_MATRIX_FILES)) \ -o $@ $(PRIVATE_FLAGS) LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_SYSTEM_COMPATIBILITY_MATRIX := $(LOCAL_BUILT_MODULE)