StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not update previous_XXX.mk when there is no change"

Browse Source
This commit is contained in:
Shinichiro Hamaji
2015-07-21 01:32:40 +00:00
committed by Gerrit Code Review
parent b74823e2ff 14da1424e0
commit b097c41630
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/cleanbuild.mk
View File

@@ -105,11 +105,10 @@ else
_crs_new_cmd := _crs_new_cmd :=
steps := steps :=
endif endif
CURRENT_CLEAN_BUILD_VERSION :=
CURRENT_CLEAN_STEPS :=
# Write the new state to the file. # Write the new state to the file.
# #
ifneq ($(CURRENT_CLEAN_BUILD_VERSION)-$(CURRENT_CLEAN_STEPS),$(INTERNAL_CLEAN_BUILD_VERSION)-$(INTERNAL_CLEAN_STEPS))
$(shell \ $(shell \
mkdir -p $(dir $(clean_steps_file)) && \ mkdir -p $(dir $(clean_steps_file)) && \
echo "CURRENT_CLEAN_BUILD_VERSION := $(INTERNAL_CLEAN_BUILD_VERSION)" > \ echo "CURRENT_CLEAN_BUILD_VERSION := $(INTERNAL_CLEAN_BUILD_VERSION)" > \
@@ -117,7 +116,10 @@ $(shell \
echo "CURRENT_CLEAN_STEPS := $(INTERNAL_CLEAN_STEPS)" >> \ echo "CURRENT_CLEAN_STEPS := $(INTERNAL_CLEAN_STEPS)" >> \
$(clean_steps_file) \ $(clean_steps_file) \
) )
endif
CURRENT_CLEAN_BUILD_VERSION :=
CURRENT_CLEAN_STEPS :=
clean_steps_file := clean_steps_file :=
INTERNAL_CLEAN_STEPS := INTERNAL_CLEAN_STEPS :=
INTERNAL_CLEAN_BUILD_VERSION := INTERNAL_CLEAN_BUILD_VERSION :=
@@ -164,7 +166,6 @@ ifdef PREVIOUS_BUILD_CONFIG
endif endif
endif endif
endif # else, this is the first build, so no need to clean. endif # else, this is the first build, so no need to clean.
PREVIOUS_BUILD_CONFIG :=
ifdef PREVIOUS_SANITIZE_TARGET ifdef PREVIOUS_SANITIZE_TARGET
ifneq "$(current_sanitize_target)" "$(PREVIOUS_SANITIZE_TARGET)" ifneq "$(current_sanitize_target)" "$(PREVIOUS_SANITIZE_TARGET)"
@@ -172,10 +173,10 @@ ifdef PREVIOUS_SANITIZE_TARGET
force_objclean := true force_objclean := true
endif endif
endif # else, this is the first build, so no need to clean. endif # else, this is the first build, so no need to clean.
PREVIOUS_SANITIZE_TARGET :=
# Write the new state to the file. # Write the new state to the file.
# #
ifneq ($(PREVIOUS_BUILD_CONFIG)-$(PREVIOUS_SANITIZE_TARGET),$(current_build_config)-$(current_sanitize_target))
$(shell \ $(shell \
mkdir -p $(dir $(previous_build_config_file)) && \ mkdir -p $(dir $(previous_build_config_file)) && \
echo "PREVIOUS_BUILD_CONFIG := $(current_build_config)" > \ echo "PREVIOUS_BUILD_CONFIG := $(current_build_config)" > \
@@ -183,6 +184,9 @@ $(shell \
echo "PREVIOUS_SANITIZE_TARGET := $(current_sanitize_target)" >> \ echo "PREVIOUS_SANITIZE_TARGET := $(current_sanitize_target)" >> \
$(previous_build_config_file) \ $(previous_build_config_file) \
) )
endif
PREVIOUS_BUILD_CONFIG :=
PREVIOUS_SANITIZE_TARGET :=
previous_build_config_file := previous_build_config_file :=
current_build_config := current_build_config :=
@@ -305,10 +309,12 @@ endif
endif # else, this is the first build, so no need to clean. endif # else, this is the first build, so no need to clean.
# Write the new state to the file. # Write the new state to the file.
ifneq ($(PREVIOUS_PREBUILT_TOOLS),$(current_prebuilt_tools))
$(shell \ $(shell \
mkdir -p $(dir $(previous_prebuilt_tools_config_file)) && \ mkdir -p $(dir $(previous_prebuilt_tools_config_file)) && \
echo "PREVIOUS_PREBUILT_TOOLS:=$(current_prebuilt_tools)" > \ echo "PREVIOUS_PREBUILT_TOOLS:=$(current_prebuilt_tools)" > \
$(previous_prebuilt_tools_config_file)) $(previous_prebuilt_tools_config_file))
endif
ifeq ($(force_tools_clean),true) ifeq ($(force_tools_clean),true)
# For this list of prebuilt tools, see prebuilts/sdk/tools/Android.mk. # For this list of prebuilt tools, see prebuilts/sdk/tools/Android.mk.

2
core/post_clean.mk
View File

@@ -88,7 +88,7 @@ MODULES_WITH_AIDL_FILES := $(sort $(MODULES_WITH_AIDL_FILES) $(modules_with_aidl
$(shell echo 'MODULES_WITH_AIDL_FILES := $(MODULES_WITH_AIDL_FILES)' >> $(current_aidl_config)) $(shell echo 'MODULES_WITH_AIDL_FILES := $(MODULES_WITH_AIDL_FILES)' >> $(current_aidl_config))
# Now current becomes previous. # Now current becomes previous.
$(shell mv -f $(current_aidl_config) $(previous_aidl_config)) $(shell cmp $(current_aidl_config) $(previous_aidl_config) > /dev/null 2>&1 || mv -f $(current_aidl_config) $(previous_aidl_config))
MODULES_WITH_AIDL_FILES := MODULES_WITH_AIDL_FILES :=
modules_with_aidl_files := modules_with_aidl_files :=