aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-08-22 08:09:32 -0700
committerElliott Hughes <enh@google.com>2019-08-22 08:09:32 -0700
commitfab2596c75f0a9f761d35e9f063972cf5cfa39ee (patch)
treee492339d1f27220cf42abce431768fba7f3384a0 /Android.bp
parent077af145ca6496c40df893070c8f2ecb1d0a8fff (diff)
downloadtoybox-fab2596c75f0a9f761d35e9f063972cf5cfa39ee.tar.gz
Android: add env/setsid/sleep back to the host config.
Also admit that we have libcrypto. We were still linking against it, but if you don't tell toybox you _have_ libcrypto it will still build commands that need libcrypto, they'll just produce the wrong output :-/ I'll fix that upstream later. Bug: http://b/139450866 Test: builds Change-Id: I94351c717f1c2f7e8f475e4142a84ec47f1ce21f
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index f46c7ddf..72d9d8dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,6 +77,7 @@ cc_defaults {
"toys/other/dos2unix.c",
"toys/other/readlink.c",
"toys/other/realpath.c",
+ "toys/other/setsid.c",
"toys/other/stat.c",
"toys/other/timeout.c",
"toys/other/which.c",
@@ -98,6 +99,7 @@ cc_defaults {
"toys/posix/dirname.c",
"toys/posix/du.c",
"toys/posix/echo.c",
+ "toys/posix/env.c",
"toys/posix/find.c",
"toys/posix/getconf.c",
"toys/posix/grep.c",
@@ -113,6 +115,7 @@ cc_defaults {
"toys/posix/rm.c",
"toys/posix/rmdir.c",
"toys/posix/sed.c",
+ "toys/posix/sleep.c",
"toys/posix/sort.c",
"toys/posix/tail.c",
"toys/posix/tar.c",
@@ -238,7 +241,6 @@ cc_defaults {
"toys/other/rev.c",
"toys/other/rmmod.c",
"toys/other/setfattr.c",
- "toys/other/setsid.c",
"toys/other/swapoff.c",
"toys/other/swapon.c",
"toys/other/sysctl.c",
@@ -262,7 +264,6 @@ cc_defaults {
"toys/posix/cksum.c",
"toys/posix/cpio.c",
"toys/posix/df.c",
- "toys/posix/env.c",
"toys/posix/expand.c",
"toys/posix/false.c",
"toys/posix/file.c",
@@ -275,7 +276,6 @@ cc_defaults {
"toys/posix/printf.c",
"toys/posix/ps.c",
"toys/posix/renice.c",
- "toys/posix/sleep.c",
"toys/posix/split.c",
"toys/posix/strings.c",
"toys/posix/time.c",