Include $(BUILD_NUMBER_FROM_FILE) in the toybox --version.
Also remove the SHA, which we haven't needed yet and isn't particularly
easy to turn back into source anyway.
Also switch to sed rather than awk, because macOS awk is lame:
awk: syntax error at source line 1
context is
match($0, >>> /TOYBOX_VERSION.*"(.*)"/, <<<
awk: bailing out at source line 1
Bug: http://b/27534935 (for the macOS awk problem)
Test: toybox --version
Change-Id: If2d86b1ef098f1710843e32f7345ae5cf251fabb
diff --git a/Android.mk b/Android.mk
index cba9072..cc0a88e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -221,14 +221,13 @@
-ffunction-sections -fdata-sections \
-fno-asynchronous-unwind-tables \
-toybox_upstream_version := $(shell awk 'match($$0, /TOYBOX_VERSION.*"(.*)"/, ary) {print ary[1]}' $(LOCAL_PATH)/main.c)
-toybox_sha := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)
+toybox_upstream_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c)
-toybox_version := $(toybox_upstream_version)-$(toybox_sha)-android
+toybox_version := $(toybox_upstream_version)-android-$(BUILD_NUMBER_FROM_FILE)
toybox_libraries := liblog libselinux libcutils libcrypto libz
-common_CFLAGS += -DTOYBOX_VERSION='"$(toybox_version)"'
+common_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\"
# not usable on Android?: freeramdisk fsfreeze install makedevs nbd-client
# partprobe pivot_root pwdx rev rfkill vconfig
