OSDN Git Service
(root)
/
android-x86
/
external-toybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'toybox/master' into HEAD
[android-x86/external-toybox.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
d430f57
..
d627129
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-62,10
+62,13
@@
LOCAL_SRC_FILES := \
toys/android/getenforce.c \
toys/android/getprop.c \
toys/android/load_policy.c \
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/restorecon.c \
toys/android/runcon.c \
+ toys/android/sendevent.c \
toys/android/setenforce.c \
toys/android/setprop.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 \
toys/lsb/dmesg.c \
toys/lsb/hostname.c \
toys/lsb/killall.c \
@@
-77,6
+80,10
@@
LOCAL_SRC_FILES := \
toys/lsb/seq.c \
toys/lsb/sync.c \
toys/lsb/umount.c \
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 \
toys/other/acpi.c \
toys/other/base64.c \
toys/other/blkid.c \
@@
-93,7
+100,6
@@
LOCAL_SRC_FILES := \
toys/other/fsfreeze.c \
toys/other/help.c \
toys/other/hwclock.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/inotifyd.c \
toys/other/insmod.c \
toys/other/ionice.c \
@@
-106,7
+112,6
@@
LOCAL_SRC_FILES := \
toys/other/modinfo.c \
toys/other/mountpoint.c \
toys/other/nbd_client.c \
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 \
toys/other/partprobe.c \
toys/other/pivot_root.c \
toys/other/pmap.c \
@@
-115,7
+120,6
@@
LOCAL_SRC_FILES := \
toys/other/readlink.c \
toys/other/realpath.c \
toys/other/rev.c \
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/rmmod.c \
toys/other/setsid.c \
toys/other/stat.c \
@@
-137,7
+141,6
@@
LOCAL_SRC_FILES := \
toys/pending/expr.c \
toys/pending/lsof.c \
toys/pending/more.c \
toys/pending/expr.c \
toys/pending/lsof.c \
toys/pending/more.c \
- toys/pending/netstat.c \
toys/pending/tar.c \
toys/pending/tr.c \
toys/pending/traceroute.c \
toys/pending/tar.c \
toys/pending/tr.c \
toys/pending/traceroute.c \
@@
-160,6
+163,7
@@
LOCAL_SRC_FILES := \
toys/posix/env.c \
toys/posix/expand.c \
toys/posix/false.c \
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 \
toys/posix/find.c \
toys/posix/grep.c \
toys/posix/head.c \
@@
-218,7
+222,7
@@
LOCAL_CFLAGS += -DTOYBOX_VERSION='"$(toybox_version)"'
LOCAL_CLANG := true
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++.
# This doesn't actually prevent us from dragging in libc++ at runtime
# because libnetd_client.so is C++.
@@
-264,6
+268,7
@@
ALL_TOOLS := \
expr \
fallocate \
false \
expr \
fallocate \
false \
+ file \
find \
flock \
free \
find \
flock \
free \
@@
-283,6
+288,7
@@
ALL_TOOLS := \
killall \
load_policy \
ln \
killall \
load_policy \
ln \
+ log \
logname \
losetup \
ls \
logname \
losetup \
ls \
@@
-331,7
+337,9
@@
ALL_TOOLS := \
sleep \
sort \
split \
sleep \
sort \
split \
+ start \
stat \
stat \
+ stop \
strings \
swapoff \
swapon \
strings \
swapoff \
swapon \