commit 04cc73404067725ddd3c93344ac0bf155e15c9be
author Elliott Hughes <enh@google.com> Wed Nov 07 03:16:05 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 07 03:16:05 2018 +0000
tree 15c4e0d6b50e917cf5828d758405d4015fd90f97
parent 12034b7bb06c11da55c233feff818ad81dd70234
parent 6970d3e2b8189d38204bacfdb90ad03cb04dbc86

Merge changes I3ec14f04,If580b968,I54c05549,Ia9ddbaf6,Ibce07e5d

* changes:
  Merge remote-tracking branch 'toybox/master' into HEAD
  Convert more option vars to the new (single letter) coding style.
  Trivial cleanup of uniq.c.
  Discard harmless error messages.
  Update news.html for 0.7.8 release.

Android.bp

diff --git a/Android.bp b/Android.bp
index a2a02f7..388a05b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,7 @@
 //  git merge toybox/master
 
 //  # Regenerate generated files.
-//  make
+//  NOBUILD=1 scripts/make.sh
 
 //  # Make any necessary Android.bp changes and rebuild.
 //  mm -j32