commit f9e2c3f5d7e0abd4c0824f30f789978bdfdf6fa5
author Dan Albert <danalbert@google.com> Wed Nov 28 16:19:01 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 28 16:19:01 2018 +0000
tree 92286b2a9a798e7e60291def171eb763f67f90b1
parent d50d40fe079873db786629b725cb928f8314c591
parent 90b9bbc5dc024a5fff4119527149b5cc0b4ecf99

Merge changes from topic "update-prebuilts-r18b"

* changes:
  Don't use libandroid_support post-21.
  Up the NDK's minimum supported API level.
  Remove legacy NDK code.

ui/build/paths/config.go

diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index d48ce58..d1d7c60 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -112,7 +112,6 @@
 	"mkdir":     Allowed,
 	"mktemp":    Allowed,
 	"mv":        Allowed,
-	"od":        Allowed,
 	"openssl":   Allowed,
 	"paste":     Allowed,
 	"patch":     Allowed,
@@ -138,7 +137,6 @@
 	"sort":      Allowed,
 	"stat":      Allowed,
 	"tar":       Allowed,
-	"tail":      Allowed,
 	"tee":       Allowed,
 	"timeout":   Allowed,
 	"todos":     Allowed,
@@ -173,7 +171,9 @@
 	"comm":   Toybox,
 	"env":    Toybox,
 	"id":     Toybox,
+	"od":     Toybox,
 	"sleep":  Toybox,
+	"tail":   Toybox,
 	"true":   Toybox,
 	"uname":  Toybox,
 	"uniq":   Toybox,