openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove zlib_fingerprint support." 

am: 53a3f70efe

Change-Id: I4afcbc02ce4da3541319f62eba5ff27e161f335d
This commit is contained in:
Sen Jiang 2017-12-27 20:54:15 +00:00 committed by android-build-merger
parent a085258968 53a3f70efe
commit 2dfaacdd93
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Makefile
View File

@ -2312,9 +2312,7 @@ $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_TOOL_EXTENSIONS := $(tool_extensions)
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_TOOL_EXTENSION := $(tool_extension) $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_TOOL_EXTENSION := $(tool_extension)
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)
# Build zlib fingerprint if using the AB Updater. updater_dep := system/update_engine/update_engine.conf
updater_dep := $(TARGET_OUT_COMMON_GEN)/zlib_fingerprint
updater_dep += system/update_engine/update_engine.conf
else else
# Build OTA tools if not using the AB Updater. # Build OTA tools if not using the AB Updater.
updater_dep := $(built_ota_tools) updater_dep := $(built_ota_tools)
@ -2547,7 +2545,6 @@ endif
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)
@# When using the A/B updater, include the updater config files in the zip. @# When using the A/B updater, include the updater config files in the zip.
$(hide) cp $(TOPDIR)system/update_engine/update_engine.conf $(zip_root)/META/update_engine_config.txt $(hide) cp $(TOPDIR)system/update_engine/update_engine.conf $(zip_root)/META/update_engine_config.txt
$(hide) cp $(TARGET_OUT_COMMON_GEN)/zlib_fingerprint $(zip_root)/META/zlib_fingerprint.txt
$(hide) for part in $(AB_OTA_PARTITIONS); do \ $(hide) for part in $(AB_OTA_PARTITIONS); do \
echo "$${part}" >> $(zip_root)/META/ab_partitions.txt; \ echo "$${part}" >> $(zip_root)/META/ab_partitions.txt; \
done done