diff options
| author | Kenny Root <kroot@google.com> | 2014-06-11 11:02:13 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-06-11 11:02:13 -0700 |
| commit | 7dfdb3c4365a325fb6dd781a7aa3464998152fe5 (patch) | |
| tree | 8cb1a7f6c0924328799de576dcf36a45d1a0a068 /toolbox/Android.mk | |
| parent | 45bda7696e8d92d9c1051b09fe4366cbda0b8e70 (diff) | |
| parent | 41b797de46ce27d133f4d887cbde8f25303a05c5 (diff) | |
| download | system_core-7dfdb3c4365a325fb6dd781a7aa3464998152fe5.zip system_core-7dfdb3c4365a325fb6dd781a7aa3464998152fe5.tar.gz system_core-7dfdb3c4365a325fb6dd781a7aa3464998152fe5.tar.bz2 | |
resolved conflicts for merge of 41b797de to master
Change-Id: Id433da0bde006a6661431ee58a627497f07c7cdf
Diffstat (limited to 'toolbox/Android.mk')
| -rw-r--r-- | toolbox/Android.mk | 130 |
1 files changed, 67 insertions, 63 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 78adf1e..c53f17d 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -2,75 +2,75 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) TOOLS := \ - ls \ - mount \ cat \ - ps \ - kill \ - ln \ - insmod \ - rmmod \ - lsmod \ - ifconfig \ - rm \ - mkdir \ - rmdir \ - getevent \ - sendevent \ - date \ - wipe \ - sync \ - umount \ - start \ - stop \ - notify \ + chcon \ + chmod \ + chown \ + clear \ cmp \ - dmesg \ - route \ - hd \ + date \ dd \ df \ + dmesg \ + du \ + getenforce \ + getevent \ getprop \ - setprop \ - watchprops \ - log \ - sleep \ - renice \ - printenv \ - smd \ - chmod \ - chown \ - newfs_msdos \ - netstat \ - ioctl \ - mv \ - schedtop \ - top \ - iftop \ + getsebool \ + hd \ id \ - uptime \ - vmstat \ - nandread \ + ifconfig \ + iftop \ + insmod \ + ioctl \ ionice \ - touch \ + kill \ + ln \ + load_policy \ + log \ + ls \ + lsmod \ lsof \ - du \ md5 \ - clear \ - getenforce \ - setenforce \ - chcon \ + mkdir \ + mknod \ + mkswap \ + mount \ + mv \ + nandread \ + netstat \ + newfs_msdos \ + nohup \ + notify \ + printenv \ + ps \ + readlink \ + renice \ restorecon \ + rm \ + rmdir \ + rmmod \ + route \ runcon \ - getsebool \ + schedtop \ + sendevent \ + setenforce \ + setprop \ setsebool \ - load_policy \ - swapon \ + sleep \ + smd \ + start \ + stop \ swapoff \ - mkswap \ - readlink \ - mknod \ - nohup + swapon \ + sync \ + top \ + touch \ + umount \ + uptime \ + vmstat \ + watchprops \ + wipe \ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) TOOLS += r @@ -94,21 +94,25 @@ LOCAL_SRC_FILES := \ toolbox.c \ uid_from_user.c \ -LOCAL_C_INCLUDES := bionic/libc/bionic - LOCAL_CFLAGS += \ -std=gnu99 \ -Werror -Wno-unused-parameter \ -include bsd-compatibility.h \ +LOCAL_C_INCLUDES += external/openssl/include + LOCAL_SHARED_LIBRARIES := \ - libcutils \ - liblog \ - libc \ - libusbhost \ - libselinux + libcrypto \ + libcutils \ + libselinux \ + +# libusbhost is only used by lsusb, and that isn't usually included in toolbox. +# The linker strips out all the unused library code in the normal case. +LOCAL_STATIC_LIBRARIES := \ + libusbhost \ LOCAL_MODULE := toolbox +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk # Including this will define $(intermediates). # |