X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=d6271290734a7b3e7a7edee825d418dca4b9fa7a;hb=a126e5f9a2;hp=6e8c26fcce8b95074e1569c616793cffa0d2f204;hpb=19ef8b8a7d596e032eb5b2449120d6d3d3031f0e;p=android-x86%2Fexternal-toybox.git

diff --git a/Android.mk b/Android.mk
index 6e8c26fc..d6271290 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,8 +38,7 @@ LOCAL_PATH := $(call my-dir)
 # To add a toy:
 #
 
-#  make menuconfig
-#  # (Select the toy you want to add.)
+#  Edit .config to enable the toy you want to add.
 #  make clean && make  # Regenerate the generated files.
 #  # Edit LOCAL_SRC_FILES below to add the toy.
 #  # If you just want to use it as "toybox x" rather than "x", you can stop now.
@@ -63,10 +62,13 @@ LOCAL_SRC_FILES := \
     toys/android/getenforce.c \
     toys/android/getprop.c \
     toys/android/load_policy.c \
+    toys/android/log.c \
     toys/android/restorecon.c \
     toys/android/runcon.c \
+    toys/android/sendevent.c \
     toys/android/setenforce.c \
     toys/android/setprop.c \
+    toys/android/start.c \
     toys/lsb/dmesg.c \
     toys/lsb/hostname.c \
     toys/lsb/killall.c \
@@ -78,6 +80,10 @@ LOCAL_SRC_FILES := \
     toys/lsb/seq.c \
     toys/lsb/sync.c \
     toys/lsb/umount.c \
+    toys/net/ifconfig.c \
+    toys/net/netcat.c \
+    toys/net/netstat.c \
+    toys/net/rfkill.c \
     toys/other/acpi.c \
     toys/other/base64.c \
     toys/other/blkid.c \
@@ -94,7 +100,6 @@ LOCAL_SRC_FILES := \
     toys/other/fsfreeze.c \
     toys/other/help.c \
     toys/other/hwclock.c \
-    toys/other/ifconfig.c \
     toys/other/inotifyd.c \
     toys/other/insmod.c \
     toys/other/ionice.c \
@@ -107,7 +112,6 @@ LOCAL_SRC_FILES := \
     toys/other/modinfo.c \
     toys/other/mountpoint.c \
     toys/other/nbd_client.c \
-    toys/other/netcat.c \
     toys/other/partprobe.c \
     toys/other/pivot_root.c \
     toys/other/pmap.c \
@@ -116,13 +120,11 @@ LOCAL_SRC_FILES := \
     toys/other/readlink.c \
     toys/other/realpath.c \
     toys/other/rev.c \
-    toys/other/rfkill.c \
     toys/other/rmmod.c \
     toys/other/setsid.c \
     toys/other/stat.c \
     toys/other/swapoff.c \
     toys/other/swapon.c \
-    toys/other/switch_root.c \
     toys/other/sysctl.c \
     toys/other/tac.c \
     toys/other/taskset.c \
@@ -139,8 +141,6 @@ LOCAL_SRC_FILES := \
     toys/pending/expr.c \
     toys/pending/lsof.c \
     toys/pending/more.c \
-    toys/pending/netstat.c \
-    toys/pending/route.c \
     toys/pending/tar.c \
     toys/pending/tr.c \
     toys/pending/traceroute.c \
@@ -163,6 +163,7 @@ LOCAL_SRC_FILES := \
     toys/posix/env.c \
     toys/posix/expand.c \
     toys/posix/false.c \
+    toys/posix/file.c \
     toys/posix/find.c \
     toys/posix/grep.c \
     toys/posix/head.c \
@@ -221,7 +222,7 @@ LOCAL_CFLAGS += -DTOYBOX_VERSION='"$(toybox_version)"'
 
 LOCAL_CLANG := true
 
-LOCAL_SHARED_LIBRARIES := libcutils libselinux
+LOCAL_SHARED_LIBRARIES := libcutils libselinux libcrypto
 
 # This doesn't actually prevent us from dragging in libc++ at runtime
 # because libnetd_client.so is C++.
@@ -231,7 +232,7 @@ LOCAL_MODULE := toybox
 
 # dupes: dd
 # useless?: freeramdisk fsfreeze install makedevs mkfifo nbd-client
-#           partprobe pivot_root pwdx rev rfkill switch_root vconfig
+#           partprobe pivot_root pwdx rev rfkill vconfig
 # prefer BSD netcat instead?: nc netcat
 # prefer efs2progs instead?: blkid chattr lsattr
 
@@ -267,6 +268,7 @@ ALL_TOOLS := \
     expr \
     fallocate \
     false \
+    file \
     find \
     flock \
     free \
@@ -286,6 +288,7 @@ ALL_TOOLS := \
     killall \
     load_policy \
     ln \
+    log \
     logname \
     losetup \
     ls \
@@ -315,6 +318,7 @@ ALL_TOOLS := \
     pmap \
     printenv \
     printf \
+    ps \
     pwd \
     readlink \
     realpath \
@@ -323,7 +327,6 @@ ALL_TOOLS := \
     rm \
     rmdir \
     rmmod \
-    route \
     runcon \
     sed \
     seq \
@@ -334,7 +337,9 @@ ALL_TOOLS := \
     sleep \
     sort \
     split \
+    start \
     stat \
+    stop \
     strings \
     swapoff \
     swapon \
@@ -347,6 +352,7 @@ ALL_TOOLS := \
     tee \
     time \
     timeout \
+    top \
     touch \
     tr \
     true \