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

Commit 160da45f authored May 02, 2017 by Tao Bao Committed by android-build-merger May 02, 2017

Merge "Add the missing dependency on payload generation script." am: 3465f2ad am: 1f632e7a

am: 4752d3cb

Change-Id: I6dd3d6b3d4679dfde950e105ad5049444d9928a0

parents 57301866 4752d3cb

core/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -2413,6 +2413,10 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

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

		ifeq ($(AB_OTA_UPDATER),true)
		$(INTERNAL_OTA_PACKAGE_TARGET): $(BRILLO_UPDATE_PAYLOAD)
		endif

		$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \
		build/tools/releasetools/ota_from_target_files
		@echo "Package OTA: $@"

core/config.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -632,6 +632,7 @@ BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer
		FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host
		VBOOT_SIGNER := prebuilts/misc/scripts/vboot_signer/vboot_signer.sh
		FEC := $(HOST_OUT_EXECUTABLES)/fec
		BRILLO_UPDATE_PAYLOAD := $(HOST_OUT_EXECUTABLES)/brillo_update_payload

		DEXDUMP := $(HOST_OUT_EXECUTABLES)/dexdump2$(BUILD_EXECUTABLE_SUFFIX)
		PROFMAN := $(HOST_OUT_EXECUTABLES)/profman