Merge "Only update previous product config when changed" am: 2fcacb5a22 am: 5f381cfcb2 am: 8e77f86d58

am: c99f688971

Change-Id: I106fcb5c030a2f9a5241a0763060179eeb0a4077
This commit is contained in:
Dan Willemsen 2016-09-17 02:44:20 +00:00 committed by android-build-merger
commit 3f3df96be9

View file

@ -151,6 +151,7 @@ endif # if not ONE_SHOT_MAKEFILE dont_bother
# necessary to keep things consistent.
previous_build_config_file := $(PRODUCT_OUT)/previous_build_config.mk
current_build_config_file := $(PRODUCT_OUT)/current_build_config.mk
current_build_config := \
$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)
@ -176,15 +177,17 @@ endif # else, this is the first build, so no need to clean.
# Write the new state to the file.
#
ifneq ($(PREVIOUS_BUILD_CONFIG)-$(PREVIOUS_SANITIZE_TARGET),$(current_build_config)-$(current_sanitize_target))
$(shell \
mkdir -p $(dir $(previous_build_config_file)) && \
mkdir -p $(dir $(current_build_config_file)) && \
echo "PREVIOUS_BUILD_CONFIG := $(current_build_config)" > \
$(previous_build_config_file) \
$(current_build_config_file) \
)
endif
$(shell cmp $(current_build_config_file) $(previous_build_config_file) > /dev/null 2>&1 || \
mv -f $(current_build_config_file) $(previous_build_config_file))
PREVIOUS_BUILD_CONFIG :=
previous_build_config_file :=
current_build_config_file :=
current_build_config :=
#