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

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

Merge "Correct some dependencies around zip packages"

parents 648ea82b ee2d2119

core/Makefile

+13 −5
Original line number Diff line number Diff line
@@ -1678,11 +1678,12 @@ endif 


ifeq ($(AB_OTA_UPDATER),true)

# Build zlib fingerprint if using the AB Updater.

$(BUILT_TARGET_FILES_PACKAGE): $(TARGET_OUT_COMMON_GEN)/zlib_fingerprint

updater_dep := $(TARGET_OUT_COMMON_GEN)/zlib_fingerprint

else

# Build OTA tools if not using the AB Updater.

$(BUILT_TARGET_FILES_PACKAGE): $(built_ota_tools)

updater_dep := $(built_ota_tools)

endif

$(BUILT_TARGET_FILES_PACKAGE): $(updater_dep)



# If we are using recovery as boot, output recovery files to BOOT/.

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
@@ -1705,6 +1706,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
		$(SELINUX_FC) \

		$(APKCERTS_FILE) \

		$(HOST_OUT_EXECUTABLES)/fs_config \

		build/tools/releasetools/add_img_to_target_files \

		| $(ACP)

	@echo "Package target files: $@"

	$(hide) rm -rf $@ $(zip_root)
@@ -1934,7 +1936,8 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip 


$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)



$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE)

$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \

		build/tools/releasetools/ota_from_target_files

	@echo "Package OTA: $@"

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	   ./build/tools/releasetools/ota_from_target_files -v \
@@ -1960,7 +1963,8 @@ name := $(name)-img-$(FILE_NAME_TAG) 


INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip



$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE)

$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \

		build/tools/releasetools/img_from_target_files

	@echo "Package: $@"

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	   ./build/tools/releasetools/img_from_target_files -v \
@@ -1983,7 +1987,11 @@ name := $(name)-symbols-$(FILE_NAME_TAG) 
SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip

# For apps_only build we'll establish the dependency later in build/core/main.mk.

ifndef TARGET_BUILD_APPS

$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_BOOTIMAGE_TARGET)

$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \

		$(INSTALLED_VENDORIMAGE_TARGET) \

		$(updater_dep)

endif

$(SYMBOLS_ZIP):

	@echo "Package symbols: $@"