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

Merge "Fix kati regen due to build_number.txt" am: 6023b1944d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1623659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfb8249d3d58d07077ae11c1142b42476ba9d3e8
This commit is contained in:
Colin Cross
2021-03-10 01:25:41 +00:00
committed by Automerger Merge Worker
parent e6a4da4796 6023b1944d
commit 1b74125136
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/main.mk
View File

@@ -41,7 +41,12 @@ include $(BUILD_SYSTEM)/clang/config.mk
# without changing the command line every time. Avoids rebuilds # without changing the command line every time. Avoids rebuilds
# when using ninja. # when using ninja.
$(shell mkdir -p $(SOONG_OUT_DIR) && \ $(shell mkdir -p $(SOONG_OUT_DIR) && \
echo -n $(BUILD_NUMBER) > $(SOONG_OUT_DIR)/build_number.txt) echo -n $(BUILD_NUMBER) > $(SOONG_OUT_DIR)/build_number.tmp; \
if ! cmp -s $(SOONG_OUT_DIR)/build_number.tmp $(SOONG_OUT_DIR)/build_number.txt; then \
mv $(SOONG_OUT_DIR)/build_number.tmp $(SOONG_OUT_DIR)/build_number.txt; \
else \
rm $(SOONG_OUT_DIR)/build_number.tmp; \
fi)
BUILD_NUMBER_FILE := $(SOONG_OUT_DIR)/build_number.txt BUILD_NUMBER_FILE := $(SOONG_OUT_DIR)/build_number.txt
.KATI_READONLY := BUILD_NUMBER_FILE .KATI_READONLY := BUILD_NUMBER_FILE
$(KATI_obsolete_var BUILD_NUMBER,See https://android.googlesource.com/platform/build/+/master/Changes.md#BUILD_NUMBER) $(KATI_obsolete_var BUILD_NUMBER,See https://android.googlesource.com/platform/build/+/master/Changes.md#BUILD_NUMBER)