diff options
| -rw-r--r-- | crypto/ext4crypt/Decrypt.cpp | 6 | ||||
| -rw-r--r-- | etc/init.recovery.logd.rc | 17 | ||||
| -rwxr-xr-x | gui/theme/common/languages/en.xml | 1 | ||||
| -rw-r--r-- | gui/theme/extra-languages/languages/zh_CN.xml | 34 | ||||
| -rw-r--r-- | gui/theme/extra-languages/languages/zh_TW.xml | 34 | ||||
| -rw-r--r-- | orscmd/orscmd.cpp | 6 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 20 | ||||
| -rw-r--r-- | toolbox/Android.mk | 37 | ||||
| -rw-r--r-- | toybox/Android.mk | 33 |
9 files changed, 142 insertions, 46 deletions
diff --git a/crypto/ext4crypt/Decrypt.cpp b/crypto/ext4crypt/Decrypt.cpp index 3eeaaf877..e69b64793 100644 --- a/crypto/ext4crypt/Decrypt.cpp +++ b/crypto/ext4crypt/Decrypt.cpp @@ -1336,7 +1336,11 @@ bool Decrypt_User(const userid_t user_id, const std::string& Password) { printf("e4crypt_unlock_user_key returned fail\n"); return false; } - if (!e4crypt_prepare_user_storage(nullptr, user_id, 0, flags)) { +#ifdef USE_KEYSTORAGE_4 + if (!e4crypt_prepare_user_storage("", user_id, 0, flags)) { +#else + if (!e4crypt_prepare_user_storage(nullptr, user_id, 0, flags)) { +#endif printf("failed to e4crypt_prepare_user_storage\n"); return false; } diff --git a/etc/init.recovery.logd.rc b/etc/init.recovery.logd.rc index 7bdbfb8bc..423039cf0 100644 --- a/etc/init.recovery.logd.rc +++ b/etc/init.recovery.logd.rc @@ -1,20 +1,8 @@ on load_all_props_action start logd - start logd-reinit on load_persist_props_action start logd - start logd-reinit - -on post-fs - start logd - -on post-fs-data - start logd - -on property:vold.decrypt=trigger_load_persist_props - start logd - start logd-reinit service logd /sbin/logd class core @@ -23,8 +11,3 @@ service logd /sbin/logd socket logdw dgram 0222 logd logd group root system seclabel u:r:logd:s0 - -service logd-reinit /sbin/logd --reinit - oneshot - disabled - seclabel u:r:logd:s0 diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml index 7a6012074..9b525f063 100755 --- a/gui/theme/common/languages/en.xml +++ b/gui/theme/common/languages/en.xml @@ -109,7 +109,6 @@ <string name="wipe_cache_dalvik_confirm">Wipe Cache & Dalvik?</string> <string name="wipe_dalvik_confirm">Wipe Dalvik?</string> <string name="wiping_cache_dalvik">Wiping Cache & Dalvik...</string> - <string name="wiping_dalvik">Wiping Dalvik...</string> <string name="wipe_cache_dalvik_complete">Cache & Dalvik Wipe Complete</string> <string name="wipe_dalvik_complete">Dalvik Wipe Complete</string> <string name="swipe_wipe">Swipe to Wipe</string> diff --git a/gui/theme/extra-languages/languages/zh_CN.xml b/gui/theme/extra-languages/languages/zh_CN.xml index 944be48b2..6b0c022e7 100644 --- a/gui/theme/extra-languages/languages/zh_CN.xml +++ b/gui/theme/extra-languages/languages/zh_CN.xml @@ -30,6 +30,7 @@ <string name="sdext">SD-EXT</string> <string name="adopted_data">Adopted Data</string> <string name="adopted_storage">Adopted 存储</string> + <string name="autostorage">存储</string> <!-- GUI XML strings --> <string name="twrp_header">Team Win Recovery Project</string> @@ -98,6 +99,7 @@ <string name="install_failed">安装失败</string> <string name="install_successful">安装成功</string> <string name="wipe_cache_dalvik_btn">清除 Cache/Dalvik</string> + <string name="wipe_dalvik_btn">清除 Dalvik</string> <string name="reboot_system_btn">重启系统</string> <string name="install_sel_target">选择目标分区</string> <string name="flash_image_select">选择要刷入镜像的分区：</string> @@ -105,8 +107,10 @@ <string name="flashing_image">正在刷入镜像…</string> <string name="image_flashed">镜像已刷入。</string> <string name="wipe_cache_dalvik_confirm">是否清除 Cache 和 Dalvik？</string> + <string name="wipe_dalvik_confirm">是否清除 Dalvik？</string> <string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik…</string> <string name="wipe_cache_dalvik_complete">Cache 和 Dalvik 清除完成</string> + <string name="wipe_dalvik_complete">Dalvik 清除完成</string> <string name="swipe_wipe">滑动按钮确认清除</string> <string name="swipe_wipe_s"> 清除</string> <string name="no_os1">没有安装任何系统！</string> @@ -318,6 +322,7 @@ <string name="settings_tz_btn">时区</string> <string name="settings_screen_btn">屏幕</string> <string name="settings_screen_bright_btn">屏幕亮度</string> + <string name="vibration_disabled">振动已在本设备上停用</string> <string name="settings_vibration_btn">振动</string> <string name="settings_language_btn">语言</string> <string name="time_zone_hdr">时区</string> @@ -480,6 +485,28 @@ <string name="install_cancel">不，以后再说</string> <string name="sel_storage_list">选择存储位置</string> <string name="ok_btn">确定</string> + <string name="install_twrp_ramdisk">安装 Recovery Ramdisk</string> + <string name="install_kernel">安装内核</string> + <string name="repack_kernel_confirm_hdr">安装内核</string> + <string name="repack_ramdisk_confirm_hdr">安装 Recovery</string> + <string name="repack_kernel_confirm">是否安装内核？</string> + <string name="repack_ramdisk_confirm">是否安装 Recovery？</string> + <string name="repack_backup_first">请先备份现有的镜像</string> + <string name="repack">重新打包</string> + <string name="swipe_to_install">滑动按钮确认安装</string> + <string name="installing">正在安装…</string> + <string name="install_complete">安装完成</string> + <string name="unpack_error">解包镜像错误。</string> + <string name="repack_error">重新打包镜像错误。</string> + <string name="unpacking_image">正在解包 {1}…</string> + <string name="repacking_image">正在打包 {1}…</string> + <string name="repack_image_hdr">选择镜像</string> + <string name="fix_recovery_loop">修复 Recovery 无限重启</string> + <string name="fix_recovery_loop_confirm">是否修复 Recovery 无限重启？</string> + <string name="fixing_recovery_loop">正在修复 Recovery 无限重启…</string> + <string name="fix_recovery_loop_complete">Recovery 无限重启修复完成</string> + <string name="fixing_recovery_loop_patch">正在对内核打补丁…</string> + <string name="fix_recovery_loop_patch_error">对内核打补丁时出错。</string> <!-- Various console messages - these consist of user displayed messages, oftentimes errors --> <string name="no_kernel_selinux">内核不支持读取 SELinux Context。</string> @@ -531,9 +558,10 @@ <string name="unable_find_part_path">找不到分区路径 '{1}'</string> <string name="update_part_details">正在更新分区详情…</string> <string name="update_part_details_done">…完成</string> - <string name="wiping_dalvik">正在清除 Dalvik Cache 目录…</string> + <string name="wiping_dalvik">正在清除 Dalvik 目录…</string> <string name="cleaned">已清除：{1}…</string> - <string name="dalvik_done">-- Dalvik Cache 清除完成！</string> + <string name="cache_dalvik_done">-- Dalvik Cache 目录清除完成！</string> + <string name="dalvik_done">-- Dalvik 目录清除完成！</string> <string name="no_andsec">未发现 android secure 分区。</string> <string name="unable_to_locate">未找到 {1}。</string> <string name="wiping_datamedia">清除内置存储 -- /data/media…</string> @@ -600,7 +628,7 @@ <string name="recreate_folder_err">无法重新创建 {1} 文件夹。</string> <string name="img_size_err">镜像大小大于目标设备</string> <string name="flashing">正在刷入 {1}…</string> - <string name="backup_folder">备份文件夹设置为：'{1}'</string> + <string name="backup_folder_set">备份文件夹设置为：'{1}'</string> <string name="locate_backup_err">未找到备份文件 '{1}'</string> <string name="set_restore_opt">设置恢复选项：'{1}'：</string> <string name="digest_check_skip" version="2">跳过校验 Digest 已开启</string> diff --git a/gui/theme/extra-languages/languages/zh_TW.xml b/gui/theme/extra-languages/languages/zh_TW.xml index fc80862c6..fe7cf49d2 100644 --- a/gui/theme/extra-languages/languages/zh_TW.xml +++ b/gui/theme/extra-languages/languages/zh_TW.xml @@ -30,6 +30,7 @@ <string name="sdext">SD-EXT</string> <string name="adopted_data">Adopted Data</string> <string name="adopted_storage">Adopted 存儲</string> + <string name="autostorage">存儲</string> <!-- GUI XML strings --> <string name="twrp_header">Team Win Recovery Project</string> @@ -98,6 +99,7 @@ <string name="install_failed">安裝失敗</string> <string name="install_successful">安裝成功</string> <string name="wipe_cache_dalvik_btn">清除 Cache/Dalvik</string> + <string name="wipe_dalvik_btn">清除 Dalvik</string> <string name="reboot_system_btn">重啟系統</string> <string name="install_sel_target">選擇目標分區</string> <string name="flash_image_select">選擇要刷入鏡像的分區：</string> @@ -105,8 +107,10 @@ <string name="flashing_image">正在刷入鏡像…</string> <string name="image_flashed">鏡像已刷入。</string> <string name="wipe_cache_dalvik_confirm">是否清除 Cache 和 Dalvik？</string> + <string name="wipe_dalvik_confirm">是否清除 Dalvik？</string> <string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik…</string> <string name="wipe_cache_dalvik_complete">Cache 和 Dalvik 清除完成</string> + <string name="wipe_dalvik_complete">Dalvik 清除完成</string> <string name="swipe_wipe">滑動按鈕確認清除</string> <string name="swipe_wipe_s"> 清除</string> <string name="no_os1">沒有安裝任何系統！</string> @@ -318,6 +322,7 @@ <string name="settings_tz_btn">時區</string> <string name="settings_screen_btn">螢幕</string> <string name="settings_screen_bright_btn">螢幕亮度</string> + <string name="vibration_disabled">振動已在本設備上停用</string> <string name="settings_vibration_btn">振動</string> <string name="settings_language_btn">語言</string> <string name="time_zone_hdr">時區</string> @@ -480,6 +485,28 @@ <string name="install_cancel">不，以後再說</string> <string name="sel_storage_list">選擇存儲位置</string> <string name="ok_btn">確定</string> + <string name="install_twrp_ramdisk">安裝 Recovery Ramdisk</string> + <string name="install_kernel">安裝內核</string> + <string name="repack_kernel_confirm_hdr">安裝內核</string> + <string name="repack_ramdisk_confirm_hdr">安裝 Recovery</string> + <string name="repack_kernel_confirm">是否安裝內核？</string> + <string name="repack_ramdisk_confirm">是否安裝 Recovery？</string> + <string name="repack_backup_first">請先備份現有的鏡像</string> + <string name="repack">重新打包</string> + <string name="swipe_to_install">滑動按鈕確認安裝</string> + <string name="installing">正在安裝…</string> + <string name="install_complete">安裝完成</string> + <string name="unpack_error">解包鏡像錯誤。</string> + <string name="repack_error">重新打包鏡像錯誤。</string> + <string name="unpacking_image">正在解包 {1}…</string> + <string name="repacking_image">正在打包 {1}…</string> + <string name="repack_image_hdr">選擇鏡像</string> + <string name="fix_recovery_loop">修復 Recovery 無限重啟</string> + <string name="fix_recovery_loop_confirm">是否修復 Recovery 無限重啟？</string> + <string name="fixing_recovery_loop">正在修復 Recovery 無限重啟…</string> + <string name="fix_recovery_loop_complete">Recovery 無限重啟修復完成</string> + <string name="fixing_recovery_loop_patch">正在對內核打補丁…</string> + <string name="fix_recovery_loop_patch_error">對內核打補丁時出錯。</string> <!-- Various console messages - these consist of user displayed messages, oftentimes errors --> <string name="no_kernel_selinux">內核不支持讀取 SELinux Context。</string> @@ -531,9 +558,10 @@ <string name="unable_find_part_path">找不到分區路徑 '{1}'</string> <string name="update_part_details">正在更新分區詳情…</string> <string name="update_part_details_done">…完成</string> - <string name="wiping_dalvik">正在清除 Dalvik Cache 目錄…</string> + <string name="wiping_dalvik">正在清除 Dalvik 目錄…</string> <string name="cleaned">已清除：{1}…</string> - <string name="dalvik_done">-- Dalvik Cache 清除完成！</string> + <string name="cache_dalvik_done">-- Dalvik Cache 目錄清除完成！</string> + <string name="dalvik_done">-- Dalvik 目錄清除完成！</string> <string name="no_andsec">未發現 android secure 分區。</string> <string name="unable_to_locate">未找到 {1}。</string> <string name="wiping_datamedia">清除內置存儲 -- /data/media…</string> @@ -600,7 +628,7 @@ <string name="recreate_folder_err">無法重新創建 {1} 檔案夾。</string> <string name="img_size_err">鏡像大小大於目標設備</string> <string name="flashing">正在刷入 {1}…</string> - <string name="backup_folder">備份檔案夾設置為：'{1}'</string> + <string name="backup_folder_set">備份檔案夾設置為：'{1}'</string> <string name="locate_backup_err">未找到備份檔案 '{1}'</string> <string name="set_restore_opt">設置恢復選項：'{1}'：</string> <string name="digest_check_skip" version="2">跳過校驗 Digest 已開啟</string> diff --git a/orscmd/orscmd.cpp b/orscmd/orscmd.cpp index fd8172dff..c47c0f67f 100644 --- a/orscmd/orscmd.cpp +++ b/orscmd/orscmd.cpp @@ -47,6 +47,12 @@ void print_usage(void) { printf(" set <variable> [value]\n"); printf(" decrypt <password>\n"); printf(" remountrw\n"); + printf(" fixperms\n"); + printf(" mount <path>\n"); + printf(" unmount <path>\n"); + printf(" print <value>\n"); + printf(" mkdir <directory>\n"); + printf(" reboot [recovery|poweroff|bootloader|download|edl]\n"); printf("\nSee more documentation at https://twrp.me/faq/openrecoveryscript.html\n"); } diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 4d67e5b77..5c0b44196 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -21,7 +21,15 @@ else RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/sh RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 23; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/grep + LOCAL_POST_INSTALL_CMD += $(hide) if [ -e "$(TARGET_RECOVERY_ROOT_OUT)/sbin/egrep" ]; then \ + rm $(TARGET_RECOVERY_ROOT_OUT)/sbin/egrep; fi; ln -sr $(TARGET_RECOVERY_ROOT_OUT)/sbin/grep $(TARGET_RECOVERY_ROOT_OUT)/sbin/egrep; \ + if [ -e "$(TARGET_RECOVERY_ROOT_OUT)/sbin/fgrep" ]; then \ + rm $(TARGET_RECOVERY_ROOT_OUT)/sbin/fgrep; fi; ln -sr $(TARGET_RECOVERY_ROOT_OUT)/sbin/grep $(TARGET_RECOVERY_ROOT_OUT)/sbin/fgrep; RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/toybox + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/dd + endif ifneq ($(wildcard external/zip/Android.mk),) RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/zip endif @@ -31,6 +39,9 @@ else ifneq ($(wildcard system/core/libziparchive/Android.bp),) RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/unzip endif + ifneq ($(wildcard external/one-true-awk/Android.bp),) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/awk + endif endif endif RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/pigz @@ -309,7 +320,11 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0) RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fsck.ntfs RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkfs.ntfs RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libntfs-3g.so - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libfuse.so + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libfuse-lite.so + else + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libfuse.so + endif else RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/ntfs-3g RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/ntfsfix @@ -526,12 +541,11 @@ endif ifeq ($(TW_USE_TOOLBOX), true) include $(CLEAR_VARS) LOCAL_MODULE := mkshrc_twrp + LOCAL_MODULE_STEM := mkshrc LOCAL_MODULE_TAGS := eng LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/etc LOCAL_SRC_FILES := $(LOCAL_MODULE) - LOCAL_POST_INSTALL_CMD := \ - $(hide) mv $(TARGET_RECOVERY_ROOT_OUT)/etc/mkshrc_twrp $(TARGET_RECOVERY_ROOT_OUT)/etc/mkshrc include $(BUILD_PREBUILT) endif diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 7d1b60251..926743850 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 @@ -316,6 +317,36 @@ ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18)) $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS) endif +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 + SYMLINKS := ALL_TOOLS := BSD_TOOLS := diff --git a/toybox/Android.mk b/toybox/Android.mk index c88f360f5..5f6edec3f 100644 --- a/toybox/Android.mk +++ b/toybox/Android.mk @@ -189,6 +189,15 @@ LOCAL_SRC_FILES := \ toys/posix/wc.c \ toys/posix/xargs.c +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -eq 26; echo $$?),0) +# Android 8.0 had some tools in different paths +LOCAL_SRC_FILES += \ + toys/pending/dmesg.c +else +LOCAL_SRC_FILES += \ + toys/lsb/dmesg.c +endif + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0) # there are some conflicts here with AOSP-7.[01] and CM-14.[01] # the following items have been removed for compatibility @@ -222,14 +231,6 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 27; echo $$?),0) LOCAL_SRC_FILES += \ toys/pending/xzcat.c endif -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -eq 26; echo $$?),0) -# Android 8.0 had some tools in different paths -LOCAL_SRC_FILES += \ - toys/pending/dmesg.c -else -LOCAL_SRC_FILES += \ - toys/lsb/dmesg.c -endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) # Android 8.0/8.1 had some tools in different paths @@ -319,6 +320,7 @@ LOCAL_SRC_FILES += \ endif LOCAL_CFLAGS += \ + -std=c99 \ -std=gnu11 \ -Os \ -Wno-char-subscripts \ @@ -330,8 +332,13 @@ LOCAL_CFLAGS += \ -ffunction-sections -fdata-sections \ -fno-asynchronous-unwind-tables \ -toybox_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c) -LOCAL_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\" +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) + toybox_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)-android + LOCAL_CFLAGS += -DTOYBOX_VERSION='"$(toybox_version)"' +else + toybox_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c) + LOCAL_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\" +endif LOCAL_CLANG := true @@ -478,18 +485,14 @@ ALL_TOOLS += \ arp \ base64 \ chattr \ - dd \ df \ diff \ - egrep \ - fgrep \ flock \ freeramdisk \ fsfreeze \ fstype \ ftpget \ ftpput \ - grep \ help \ install \ ionice \ @@ -543,7 +546,7 @@ ALL_TOOLS += \ gzip \ gunzip \ zcat -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 27; echo $$?),0) +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) ALL_TOOLS += \ fmt \ start \ |