X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=8f3698dc2e4676d63651e31fd34f12ff1292c566;hb=86fb74fe51d96e63fd9576813064b23fb2476706;hp=cc0a88e78deed43cd80e65f39daffa8791e1121e;hpb=77666693a18a788c51b3af94e0f30fe48aff48ee;p=android-x86%2Fexternal-toybox.git

diff --git a/Android.mk b/Android.mk
index cc0a88e7..8f3698dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,6 +67,7 @@ common_SRC_FILES := \
     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/md5sum.c \
@@ -89,6 +90,7 @@ common_SRC_FILES := \
     toys/other/blockdev.c \
     toys/other/chcon.c \
     toys/other/chroot.c \
+    toys/other/chrt.c \
     toys/other/clear.c \
     toys/other/dos2unix.c \
     toys/other/fallocate.c \
@@ -104,6 +106,7 @@ common_SRC_FILES := \
     toys/other/losetup.c \
     toys/other/lsattr.c \
     toys/other/lsmod.c \
+    toys/other/lspci.c \
     toys/other/lsusb.c \
     toys/other/makedevs.c \
     toys/other/mkswap.c \
@@ -135,10 +138,8 @@ common_SRC_FILES := \
     toys/other/which.c \
     toys/other/xxd.c \
     toys/other/yes.c \
-    toys/pending/chrt.c \
     toys/pending/dd.c \
     toys/pending/diff.c \
-    toys/pending/dmesg.c \
     toys/pending/expr.c \
     toys/pending/getfattr.c \
     toys/pending/gzip.c \
@@ -213,6 +214,8 @@ common_CFLAGS := \
     -std=c99 \
     -Os \
     -Wno-char-subscripts \
+    -Wno-gnu-variable-sized-type-not-at-end \
+    -Wno-missing-field-initializers \
     -Wno-sign-compare \
     -Wno-string-plus-int \
     -Wno-uninitialized \
@@ -296,6 +299,7 @@ ALL_TOOLS := \
     ls \
     lsmod \
     lsof \
+    lspci \
     lsusb \
     md5sum \
     mkdir \
@@ -433,8 +437,5 @@ LOCAL_STATIC_LIBRARIES := $(toybox_libraries)
 LOCAL_CXX_STL := libc++_static
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-# TODO: is there any reason to only have modprobe in recovery?
-RECOVERY_TOOLS := modprobe
-# Install the symlinks.
-LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(RECOVERY_TOOLS),ln -sf ${LOCAL_MODULE} $(LOCAL_MODULE_PATH)/$(t);)
+LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf ${LOCAL_MODULE} $(LOCAL_MODULE_PATH)/$(t);)
 include $(BUILD_EXECUTABLE)