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

Commit bd0bab23 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by Gerrit Code Review
Browse files

Merge "Add input dependencies to .img targets"

parents 71211d8a 3deb87d5

core/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ ifeq ($(BOARD_BVB_ENABLE),true) 
FULL_SYSTEMIMAGE_DEPS += $(BVBTOOL)

endif



$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE)

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(BUILD_IMAGE_SRCS)

	$(call build-systemimage-target,$@)



INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img
@@ -1375,7 +1375,8 @@ endef 
# We just build this directly to the install location.

INSTALLED_USERDATAIMAGE_TARGET := $(BUILT_USERDATAIMAGE_TARGET)

$(INSTALLED_USERDATAIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) \

                                   $(INTERNAL_USERDATAIMAGE_FILES)

                                   $(INTERNAL_USERDATAIMAGE_FILES) \

                                   $(BUILD_IMAGE_SRCS)

	$(build-userdataimage-target)



.PHONY: userdataimage-nodeps
@@ -1459,7 +1460,7 @@ endef 


# We just build this directly to the install location.

INSTALLED_CACHEIMAGE_TARGET := $(BUILT_CACHEIMAGE_TARGET)

$(INSTALLED_CACHEIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAGE_FILES)

$(INSTALLED_CACHEIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAGE_FILES) $(BUILD_IMAGE_SRCS)

	$(build-cacheimage-target)



.PHONY: cacheimage-nodeps
@@ -1504,7 +1505,7 @@ endef 


# We just build this directly to the install location.

INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET)

$(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES) $(INSTALLED_FILES_FILE_VENDOR)

$(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES) $(INSTALLED_FILES_FILE_VENDOR) $(BUILD_IMAGE_SRCS)

	$(build-vendorimage-target)



.PHONY: vendorimage-nodeps

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ DEFAULT_JACK_EXTRA_ARGS += --verbose error 
PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

MERGETAGS := build/tools/merge-event-log-tags.py

BUILD_IMAGE_SRCS := $(wildcard build/tools/releasetools/*.py)

APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg

VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree