Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb56606 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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

(cherry picked from commit fd4c6b0a)

Change-Id: I53267edaac0b92ad062a5df0f3201e3952eb084e
parent eb49dd79

toolbox/Android.mk

+194 −88
Original line number Diff line number Diff line 
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,19 +71,81 @@ 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)



TOOLS := \

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 \



OUR_TOOLS := \

    chcon \

    chmod \

	chown \

    clear \

    cmp \

    date \

	dd \

    df \

    dmesg \

	du \

    getenforce \

    getevent \

    getprop \
@@ -37,7 +157,6 @@ TOOLS := \ 
    insmod \

    ioctl \

    ionice \

	ln \

    load_policy \

    log \

    ls \
@@ -48,19 +167,15 @@ TOOLS := \ 
    mknod \

    mkswap \

    mount \

	mv \

    nandread \

    netstat \

    newfs_msdos \

    nohup \

    notify \

	printenv \

    ps \

    readlink \

    renice \

    restorecon \

	rm \

	rmdir \

    rmmod \

    route \

    runcon \
@@ -69,13 +184,11 @@ TOOLS := \ 
    setenforce \

    setprop \

    setsebool \

	sleep \

    smd \

    start \

    stop \

    swapoff \

    swapon \

	sync \

    top \

    touch \

    umount \
@@ -85,27 +198,21 @@ TOOLS := \ 
    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 \

    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 \

	grep/fastgrep.c \

	grep/file.c \

	grep/grep.c \

	grep/queue.c \

	grep/util.c \

	$(patsubst %,%.c,$(TOOLS)) \

    pwcache.c \

    $(patsubst %,%.c,$(OUR_TOOLS)) \

    toolbox.c \

	uid_from_user.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