diff options
| author | bigbiff bigbiff <bigbiff@teamw.in> | 2019-04-24 02:05:28 +0200 |
|---|---|---|
| committer | bigbiff bigbiff <bigbiff@teamw.in> | 2019-05-05 01:55:16 +0200 |
| commit | 6af36a4f37b06a54db28bed6cbb6dd4467489a88 (patch) | |
| tree | fd8cf9a6a17cee64f15faf39be19d6c95116a7de /toolbox | |
| parent | Merge "awk: add awk for trees including one-true-awk" into android-9.0 (diff) | |
| download | android_bootable_recovery-6af36a4f37b06a54db28bed6cbb6dd4467489a88.tar android_bootable_recovery-6af36a4f37b06a54db28bed6cbb6dd4467489a88.tar.gz android_bootable_recovery-6af36a4f37b06a54db28bed6cbb6dd4467489a88.tar.bz2 android_bootable_recovery-6af36a4f37b06a54db28bed6cbb6dd4467489a88.tar.lz android_bootable_recovery-6af36a4f37b06a54db28bed6cbb6dd4467489a88.tar.xz android_bootable_recovery-6af36a4f37b06a54db28bed6cbb6dd4467489a88.tar.zst android_bootable_recovery-6af36a4f37b06a54db28bed6cbb6dd4467489a88.zip | |
Diffstat (limited to 'toolbox')
| -rw-r--r-- | toolbox/Android.mk | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 7d1b60251..6698491b3 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -43,8 +43,7 @@ endif ifeq ($(TW_USE_TOOLBOX), true) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0) # These are the only toolbox tools in M. The rest are now in toybox. - BSD_TOOLS := \ - $(if $(filter $(PLATFORM_SDK_VERSION), 23 24), du) + BSD_TOOLS := OUR_TOOLS := \ newfs_msdos @@ -60,9 +59,10 @@ ifeq ($(TW_USE_TOOLBOX), true) stop endif - ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23)) + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) BSD_TOOLS += \ dd \ + du \ OUR_TOOLS += \ df \ @@ -165,6 +165,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 27; echo $$?),0) OUR_TOOLS += getevent LOCAL_C_INCLUDES += $(TWRP_TOOLBOX_PATH) LOCAL_WHOLE_STATIC_LIBRARIES += libtoolbox_dd + ifneq ($(TW_USE_TOOLBOX), true) OUR_TOOLS += newfs_msdos endif @@ -288,6 +289,37 @@ $(TOOLS_H): PRIVATE_CUSTOM_TOOL = echo "/* file generated automatically */" > $@ $(TOOLS_H): $(transform-generated-source) + +ifeq ($(TW_USE_TOOLBOX), true) + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0) + include $(CLEAR_VARS) + LOCAL_MODULE := dd_twrp + LOCAL_MODULE_STEM := dd + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin + LOCAL_MODULE_TAGS := optional + LOCAL_CFLAGS := -include bsd-compatibility.h -DNO_CONV -Wno-unused-parameter + LOCAL_C_INCLUDES := system/core/toolbox/upstream-netbsd/include/ system/core/toolbox/upstream-netbsd/bin/dd system/core/toolbox + + LOCAL_SHARED_LIBRARIES := \ + libcutils \ + + 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 \ + 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 + + include $(BUILD_EXECUTABLE) + endif +endif + # toolbox setenforce is used during init in non-symlink form, so it was # required to be included as part of the suite above. if busybox already # provides setenforce, we can omit the toolbox symlink |