commit 40ea7379a8c90b7fb1cf37421a81234856699ef8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 10 19:13:43 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 10 19:13:43 2021 +0000
tree 7d9332813db902437d5acfc5fc9a8c729f508f5e
parent 6023b1944d2c2d2895d125d7c20ff3c40ff39a1f
parent e564ec350223a027891ca171958e38d582b7c672

Merge "Workaround for existing packages check failure when the `generic` product is used with ART prebuilts."

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index f6dbd9d..97ed93d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -41,7 +41,12 @@
 # without changing the command line every time.  Avoids rebuilds
 # when using ninja.
 $(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
 .KATI_READONLY := BUILD_NUMBER_FILE
 $(KATI_obsolete_var BUILD_NUMBER,See https://android.googlesource.com/platform/build/+/master/Changes.md#BUILD_NUMBER)