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

am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build."

Browse Source 
* commit 'fd43aa8a02d8415121694b4edd15ea8d549a7d3d':
  Fix writing clean_steps.mk in the first build.
This commit is contained in:
Ying Wang
2015-08-04 19:21:38 +00:00
committed by Android Git Automerger
parent 32350fc547 fd43aa8a02
commit 5c78a488d0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/cleanbuild.mk
View File

@@ -54,6 +54,7 @@ endef
# can have permission to touch it. # can have permission to touch it.
include $(BUILD_SYSTEM)/cleanspec.mk include $(BUILD_SYSTEM)/cleanspec.mk
INTERNAL_CLEAN_BUILD_VERSION := $(strip $(INTERNAL_CLEAN_BUILD_VERSION)) INTERNAL_CLEAN_BUILD_VERSION := $(strip $(INTERNAL_CLEAN_BUILD_VERSION))
INTERNAL_CLEAN_STEPS := $(strip $(INTERNAL_CLEAN_STEPS))
# If the clean_steps.mk file is missing (usually after a clean build) # If the clean_steps.mk file is missing (usually after a clean build)
# then we won't do anything. # then we won't do anything.
@@ -108,7 +109,15 @@ endif
# Write the new state to the file. # Write the new state to the file.
# #
rewrite_clean_steps_file :=
ifneq ($(CURRENT_CLEAN_BUILD_VERSION)-$(CURRENT_CLEAN_STEPS),$(INTERNAL_CLEAN_BUILD_VERSION)-$(INTERNAL_CLEAN_STEPS)) ifneq ($(CURRENT_CLEAN_BUILD_VERSION)-$(CURRENT_CLEAN_STEPS),$(INTERNAL_CLEAN_BUILD_VERSION)-$(INTERNAL_CLEAN_STEPS))
rewrite_clean_steps_file := true
endif
ifeq ($(wildcard $(clean_steps_file)),)
# This is the first build.
rewrite_clean_steps_file := true
endif
ifeq ($(rewrite_clean_steps_file),true)
$(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)" > \
@@ -121,6 +130,7 @@ endif
CURRENT_CLEAN_BUILD_VERSION := CURRENT_CLEAN_BUILD_VERSION :=
CURRENT_CLEAN_STEPS := CURRENT_CLEAN_STEPS :=
clean_steps_file := clean_steps_file :=
rewrite_clean_steps_file :=
INTERNAL_CLEAN_STEPS := INTERNAL_CLEAN_STEPS :=
INTERNAL_CLEAN_BUILD_VERSION := INTERNAL_CLEAN_BUILD_VERSION :=