i was going to send this patch to allow Android to add "-android" without having to work out what the toybox version would otherwise have been:
diff --git a/main.c b/main.c index 6025d43..57e53ec 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.4"TOYBOX_VENDOR #endif // Populate toy_list[]. but i notice that you haven't updated that to 0.7.5 yet, and are instead relying on `git describe --tags` to override this. is that the plan going forward, or was this just an oversight? the reason i bring this up now is that with Treble there are two (potentially different) copies of toybox on a device: the /system one and the /vendor one which may lag behind, but is built from the same source. in the past we've used sed(1) to hack this together, but it might make more sense to just support this in toybox (similar to what mksh does). especially for us, because we're moving to a more declarative build system where that gets a bit more interesting (https://android-review.googlesource.com/511275). but if your plan is for the git tag to be the one true source of version, we can switch to a git/sed combo... -- Elliott Hughes - http://who/enh - http://jessies.org/~enh/ Android native code/tools questions? Mail me/drop by/add me as a reviewer. _______________________________________________ Toybox mailing list [email protected] http://lists.landley.net/listinfo.cgi/toybox-landley.net
