am a53c8ff7: Switch to toybox ionice, iorenice, and renice.

[android-x86/external-toybox.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 645da6d..15962d6 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -90,9 +90,11 @@ LOCAL_SRC_FILES := \
     toys/other/freeramdisk.c \
     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 \
     toys/other/losetup.c \
     toys/other/lsattr.c \
     toys/other/lsmod.c \
@@ -127,10 +129,10 @@ LOCAL_SRC_FILES := \
     toys/other/vconfig.c \
     toys/other/vmstat.c \
     toys/other/which.c \
+    toys/other/xxd.c \
     toys/other/yes.c \
     toys/pending/dd.c \
     toys/pending/expr.c \
-    toys/pending/hwclock.c \
     toys/pending/more.c \
     toys/pending/pgrep.c \
     toys/pending/netstat.c \
@@ -213,9 +215,13 @@ LOCAL_CLANG := true
 
 LOCAL_SHARED_LIBRARIES := libcutils libselinux
 
+# This doesn't actually prevent us from dragging in libc++ at runtime
+# because libnetd_client.so is C++.
+LOCAL_CXX_STL := none
+
 LOCAL_MODULE := toybox
 
-# dupes: dd df du ls mount renice
+# dupes: dd df du ls
 # useless?: freeramdisk fsfreeze install makedevs mkfifo nbd-client
 #           partprobe pivot_root pwdx rev rfkill switch_root tty vconfig
 # prefer BSD netcat instead?: nc netcat
@@ -262,6 +268,8 @@ ALL_TOOLS := \
     ifconfig \
     inotifyd \
     insmod \
+    ionice \
+    iorenice \
     kill \
     load_policy \
     ln \
@@ -276,6 +284,7 @@ ALL_TOOLS := \
     mktemp \
     modinfo \
     more \
+    mount \
     mountpoint \
     mv \
     netstat \
@@ -294,6 +303,7 @@ ALL_TOOLS := \
     pwd \
     readlink \
     realpath \
+    renice \
     restorecon \
     rm \
     rmdir \
@@ -326,6 +336,7 @@ ALL_TOOLS := \
     tr \
     true \
     truncate \
+    tty \
     umount \
     uname \
     uniq \
@@ -336,6 +347,7 @@ ALL_TOOLS := \
     which \
     whoami \
     xargs \
+    xxd \
     yes \
 
 # Install the symlinks.