Use HAS_BUILD_NUMBER to check engineering build
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.
Test: m -j32
Bug: b/70351683
Change-Id: Ic2a6e2095712828c8314fdd5fca7669f2fb88bc3
diff --git a/brillo_config/Android.mk b/brillo_config/Android.mk
index 61ec0cc..c132f19 100644
--- a/brillo_config/Android.mk
+++ b/brillo_config/Android.mk
@@ -81,8 +81,8 @@
# your product makefile and increase it manually.
$(LOCAL_BUILT_MODULE):
$(hide) mkdir -p $(dir $@)
-ifeq ($(shell echo $(BUILD_NUMBER) | grep -E '[^0-9]'),)
- echo $(BRILLO_SYSTEM_VERSION).$(BUILD_NUMBER) > $@
+ifeq ($(strip $(HAS_BUILD_NUMBER)),true)
+ echo $(BRILLO_SYSTEM_VERSION).$(file <$(BUILD_NUMBER_FILE)) > $@
else
echo $(BRILLO_SYSTEM_VERSION).$(BUILD_DATETIME_FROM_FILE) > $@
endif