X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=a2cfe5fe4f843634f63d153db9690290499d949d;hb=35c8dee8cf695da018f17c0f28eacaab6aa15b32;hp=c00a1d6f3e81d4493f287013614114782ff296ad;hpb=8175e87953540188c5049a61ad4a2f403bb4a855;p=android-x86%2Fexternal-toybox.git

diff --git a/Android.mk b/Android.mk
index c00a1d6f..a2cfe5fe 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,12 +138,11 @@ 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 \
     toys/pending/lsof.c \
     toys/pending/modprobe.c \
     toys/pending/more.c \
@@ -212,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 \
@@ -220,36 +224,19 @@ common_CFLAGS := \
     -ffunction-sections -fdata-sections \
     -fno-asynchronous-unwind-tables \
 
-toybox_upstream_version := $(shell awk 'match($$0, /TOYBOX_VERSION.*"(.*)"/, ary) {print ary[1]}' $(LOCAL_PATH)/main.c)
-toybox_sha := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)
+toybox_upstream_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c)
 
-toybox_version := $(toybox_upstream_version)-$(toybox_sha)-android
+toybox_version := $(toybox_upstream_version)-android
 
-common_CFLAGS += -DTOYBOX_VERSION='"$(toybox_version)"'
+toybox_libraries := liblog libselinux libcutils libcrypto libz
 
-############################################
-# toybox for /system
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(common_SRC_FILES)
-
-LOCAL_CFLAGS := $(common_CFLAGS)
-
-LOCAL_CLANG := true
+common_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\"
 
-LOCAL_SHARED_LIBRARIES := liblog libselinux libcutils libcrypto
-
-# 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
-# useless?: freeramdisk fsfreeze install makedevs nbd-client
-#           partprobe pivot_root pwdx rev rfkill vconfig
-# prefer BSD netcat instead?: nc netcat
-# prefer efs2progs instead?: blkid chattr lsattr
+# not usable on Android?: freeramdisk fsfreeze install makedevs nbd-client
+#                         partprobe pivot_root pwdx rev rfkill vconfig
+# currently prefer BSD system/core/toolbox: dd
+# currently prefer BSD external/netcat: nc netcat
+# currently prefer external/efs2progs: blkid chattr lsattr
 
 ALL_TOOLS := \
     acpi \
@@ -291,6 +278,8 @@ ALL_TOOLS := \
     getenforce \
     getprop \
     groups \
+    gunzip \
+    gzip \
     head \
     hostname \
     hwclock \
@@ -310,6 +299,7 @@ ALL_TOOLS := \
     ls \
     lsmod \
     lsof \
+    lspci \
     lsusb \
     md5sum \
     mkdir \
@@ -398,69 +388,50 @@ ALL_TOOLS := \
     xargs \
     xxd \
     yes \
+    zcat \
 
-# Install the symlinks.
-LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGET_OUT)/bin/$(t);)
-
-include $(BUILD_EXECUTABLE)
-
-ifeq ($(PRODUCT_FULL_TREBLE),true)
 ############################################
-# static version to be installed in /vendor
-#
-include $(CLEAR_VARS)
+# toybox for /system
+############################################
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := toybox
 LOCAL_SRC_FILES := $(common_SRC_FILES)
-
 LOCAL_CFLAGS := $(common_CFLAGS)
+LOCAL_SHARED_LIBRARIES := $(toybox_libraries)
+# This doesn't actually prevent us from dragging in libc++ at runtime
+# because libnetd_client.so is C++.
+LOCAL_CXX_STL := none
+LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGET_OUT)/bin/$(t);)
+include $(BUILD_EXECUTABLE)
 
-LOCAL_CLANG := true
-
-LOCAL_STATIC_LIBRARIES := liblog libcutils libselinux libcrypto libm libc
-
-# libc++_static is needed by static liblog
-LOCAL_CXX_STL := libc++_static
-
-LOCAL_VENDOR_MODULE := true
+############################################
+# toybox for /vendor
+############################################
 
+include $(CLEAR_VARS)
 LOCAL_MODULE := toybox_vendor
-
+LOCAL_VENDOR_MODULE := true
+LOCAL_SRC_FILES := $(common_SRC_FILES)
+LOCAL_CFLAGS := $(common_CFLAGS)
+LOCAL_STATIC_LIBRARIES := libcutils libcrypto libz
+LOCAL_SHARED_LIBRARIES := libselinux_vendor liblog
 LOCAL_MODULE_TAGS := optional
-
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-
-# Install the symlinks.
 LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf ${LOCAL_MODULE} $(TARGET_OUT_VENDOR_EXECUTABLES)/$(t);)
-
 include $(BUILD_EXECUTABLE)
-endif
 
 ############################################
 # static version to be installed in recovery
+############################################
 
 include $(CLEAR_VARS)
-
+LOCAL_MODULE := toybox_static
 LOCAL_SRC_FILES := $(common_SRC_FILES)
-
 LOCAL_CFLAGS := $(common_CFLAGS)
-
-LOCAL_CLANG := true
-
-LOCAL_STATIC_LIBRARIES := liblog libselinux libcutils libcrypto libm libc
-
+LOCAL_STATIC_LIBRARIES := $(toybox_libraries)
 # libc++_static is needed by static liblog
 LOCAL_CXX_STL := libc++_static
-
-LOCAL_MODULE := toybox_static
-
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-
-ALL_TOOLS := \
-    modprobe \
-
-# Install the symlinks.
 LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf ${LOCAL_MODULE} $(LOCAL_MODULE_PATH)/$(t);)
-
 include $(BUILD_EXECUTABLE)