commit cf77ae240a1d3797c535c4f7ba000cd008394618
author Elliott Hughes <enh@google.com> Mon Oct 23 15:59:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 15:59:21 2017 +0000
tree c1941a4b1a074c2f70e32624ffb0b3b5cd34f329
parent c813bc05f7435c503788067d2bf9f3c906c8019d
parent cb633d4175eb1d532fc094260d7a307d31e39faf

Merge remote-tracking branch 'toybox/master' into HEAD
am: cb633d4175

Change-Id: Iabf046987aeeef1d866415ae35bff412c52bf29d

Android.mk

diff --git a/Android.mk b/Android.mk
index c7dbf6b..f0a84ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -233,13 +233,9 @@
     -ffunction-sections -fdata-sections \
     -fno-asynchronous-unwind-tables \
 
-toybox_upstream_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c)
-
-toybox_version := $(toybox_upstream_version)-android
-
 toybox_libraries := liblog libselinux libcutils libcrypto libz
 
-common_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\"
+common_CFLAGS += -DTOYBOX_VENDOR=\"-android\"
 
 # not usable on Android?: freeramdisk fsfreeze install makedevs nbd-client
 #                         partprobe pivot_root pwdx rev rfkill vconfig

main.c

diff --git a/main.c b/main.c
index 6025d43..3c80a99 100644
--- a/main.c
+++ b/main.c
@@ -6,7 +6,10 @@
 #include "toys.h"
 
 #ifndef TOYBOX_VERSION
-#define TOYBOX_VERSION "0.7.4"
+#ifndef TOYBOX_VENDOR
+#define TOYBOX_VENDOR ""
+#endif
+#define TOYBOX_VERSION "0.7.5"TOYBOX_VENDOR
 #endif
 
 // Populate toy_list[].