diff options
author | Elliott Hughes <enh@google.com> | 2014-07-22 17:20:15 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-07-24 17:20:51 -0700 |
commit | fd4c6b0a3a25921a9fe24691a695d715aecb6afe (patch) | |
tree | b98f7721d38ac93dec6c1a4138843ecee01d991e /toolbox/Android.mk | |
parent | 2fd1fec6197e0ede7a404e106e3dc6ce226dca58 (diff) | |
download | system_core-fd4c6b0a3a25921a9fe24691a695d715aecb6afe.zip system_core-fd4c6b0a3a25921a9fe24691a695d715aecb6afe.tar.gz system_core-fd4c6b0a3a25921a9fe24691a695d715aecb6afe.tar.bz2 |
Refresh toolbox.
Use more upstream NetBSD, and update those things that were already NetBSD.
Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have
changes marked by __ANDROID__.
Bug: 16493461
Change-Id: I99762bfe02caa0945ea4a184670888a4b5435a1d
Diffstat (limited to 'toolbox/Android.mk')
-rw-r--r-- | toolbox/Android.mk | 282 |
1 files changed, 194 insertions, 88 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index fb2c5c7..d8d397e 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -1,10 +1,68 @@ LOCAL_PATH:= $(call my-dir) + common_cflags := \ -std=gnu99 \ -Werror -Wno-unused-parameter \ + -I$(LOCAL_PATH)/upstream-netbsd/include/ \ -include bsd-compatibility.h \ + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/bin/cat/cat.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=cat_main +LOCAL_MODULE := libtoolbox_cat +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/sbin/chown/chown.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=chown_main +LOCAL_MODULE := libtoolbox_chown +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := \ + upstream-netbsd/bin/cp/cp.c \ + upstream-netbsd/bin/cp/utils.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=cp_main +LOCAL_MODULE := libtoolbox_cp +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := \ + upstream-netbsd/bin/dd/args.c \ + upstream-netbsd/bin/dd/conv.c \ + upstream-netbsd/bin/dd/dd.c \ + upstream-netbsd/bin/dd/dd_hostops.c \ + upstream-netbsd/bin/dd/misc.c \ + upstream-netbsd/bin/dd/position.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV +LOCAL_MODULE := libtoolbox_dd +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/usr.bin/du/du.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=du_main +LOCAL_MODULE := libtoolbox_du +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := \ + upstream-netbsd/usr.bin/grep/fastgrep.c \ + upstream-netbsd/usr.bin/grep/file.c \ + upstream-netbsd/usr.bin/grep/grep.c \ + upstream-netbsd/usr.bin/grep/queue.c \ + upstream-netbsd/usr.bin/grep/util.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=grep_main +LOCAL_MODULE := libtoolbox_grep +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + include $(CLEAR_VARS) LOCAL_SRC_FILES := upstream-netbsd/bin/kill/kill.c LOCAL_CFLAGS += $(common_cflags) -Dmain=kill_main @@ -13,99 +71,148 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/bin/ln/ln.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=ln_main +LOCAL_MODULE := libtoolbox_ln +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/bin/mv/mv.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=mv_main -D__SVR4 +LOCAL_MODULE := libtoolbox_mv +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/usr.bin/printenv/printenv.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=printenv_main +LOCAL_MODULE := libtoolbox_printenv +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/bin/rm/rm.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=rm_main +LOCAL_MODULE := libtoolbox_rm +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/bin/rmdir/rmdir.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=rmdir_main +LOCAL_MODULE := libtoolbox_rmdir +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/bin/sleep/sleep.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=sleep_main +LOCAL_MODULE := libtoolbox_sleep +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := upstream-netbsd/bin/sync/sync.c +LOCAL_CFLAGS += $(common_cflags) -Dmain=sync_main +LOCAL_MODULE := libtoolbox_sync +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_STATIC_LIBRARY) + + +include $(CLEAR_VARS) + +BSD_TOOLS := \ + cat \ + chown \ + cp \ + dd \ + du \ + grep \ + kill \ + ln \ + mv \ + printenv \ + rm \ + rmdir \ + sleep \ + sync \ -TOOLS := \ - cat \ - chcon \ - chmod \ - chown \ - clear \ - cmp \ - date \ - dd \ - df \ - dmesg \ - du \ - getenforce \ - getevent \ - getprop \ - getsebool \ - hd \ - id \ - ifconfig \ - iftop \ - insmod \ - ioctl \ - ionice \ - ln \ - load_policy \ - log \ - ls \ - lsmod \ - lsof \ - md5 \ - mkdir \ - mknod \ - mkswap \ - mount \ - mv \ - nandread \ - netstat \ - newfs_msdos \ - nohup \ - notify \ - printenv \ - ps \ - readlink \ - renice \ - restorecon \ - rm \ - rmdir \ - rmmod \ - route \ - runcon \ - schedtop \ - sendevent \ - setenforce \ - setprop \ - setsebool \ - sleep \ - smd \ - start \ - stop \ - swapoff \ - swapon \ - sync \ - top \ - touch \ - umount \ - uptime \ - vmstat \ - watchprops \ - wipe \ +OUR_TOOLS := \ + chcon \ + chmod \ + clear \ + cmp \ + date \ + df \ + dmesg \ + getenforce \ + getevent \ + getprop \ + getsebool \ + hd \ + id \ + ifconfig \ + iftop \ + insmod \ + ioctl \ + ionice \ + load_policy \ + log \ + ls \ + lsmod \ + lsof \ + md5 \ + mkdir \ + mknod \ + mkswap \ + mount \ + nandread \ + netstat \ + newfs_msdos \ + nohup \ + notify \ + ps \ + readlink \ + renice \ + restorecon \ + rmmod \ + route \ + runcon \ + schedtop \ + sendevent \ + setenforce \ + setprop \ + setsebool \ + smd \ + start \ + stop \ + swapoff \ + swapon \ + top \ + touch \ + umount \ + uptime \ + vmstat \ + watchprops \ + wipe \ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -TOOLS += r +OUR_TOOLS += r endif -ALL_TOOLS = $(TOOLS) -ALL_TOOLS += \ - cp \ - grep \ - kill \ +ALL_TOOLS = $(BSD_TOOLS) $(OUR_TOOLS) LOCAL_SRC_FILES := \ - cp/cp.c \ - cp/utils.c \ - dynarray.c \ - grep/fastgrep.c \ - grep/file.c \ - grep/grep.c \ - grep/queue.c \ - grep/util.c \ - $(patsubst %,%.c,$(TOOLS)) \ - toolbox.c \ - uid_from_user.c \ + upstream-netbsd/lib/libc/gen/getbsize.c \ + upstream-netbsd/lib/libc/gen/humanize_number.c \ + upstream-netbsd/lib/libc/stdlib/strsuftoll.c \ + upstream-netbsd/lib/libc/string/swab.c \ + upstream-netbsd/lib/libutil/raise_default_signal.c \ + dynarray.c \ + pwcache.c \ + $(patsubst %,%.c,$(OUR_TOOLS)) \ + toolbox.c \ LOCAL_CFLAGS += $(common_cflags) @@ -121,8 +228,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libusbhost \ -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libtoolbox_kill \ +LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS)) LOCAL_MODULE := toolbox LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk |