PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build in 5.1 tree

Browse Source 
Change-Id: I15f888d58c01de00920dc5c56148d363f4dd79b8
This commit is contained in:
Dees Troy
2019-04-03 05:23:34 +02:00
parent e4bdb15a5f
commit 9a4d7403d9
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minuitwrp/Android.mk
+1 -1
View File
@@ -189,7 +189,7 @@ endif
LOCAL_CLANG := true
LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libpng libutils
LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libpng libutils libc++
ifneq ($(TW_INCLUDE_JPEG),)
LOCAL_SHARED_LIBRARIES += libjpeg
endif
minuitwrp/events.cpp
+4 -2
View File
@@ -127,12 +127,14 @@ int write_to_file(const std::string& fn, const std::string& line) {
int vibrate(int timeout_ms)
{
if (timeout_ms > 10000) timeout_ms = 1000;
char tout[6];
sprintf(tout, "%i", timeout_ms);
if (std::ifstream(LEDS_HAPTICS_ACTIVATE_FILE).good()) {
write_to_file(LEDS_HAPTICS_DURATION_FILE, std::to_string(timeout_ms));
write_to_file(LEDS_HAPTICS_DURATION_FILE, tout);
write_to_file(LEDS_HAPTICS_ACTIVATE_FILE, "1");
} else
write_to_file(VIBRATOR_TIMEOUT_FILE, std::to_string(timeout_ms));
write_to_file(VIBRATOR_TIMEOUT_FILE, tout);
return 0;
}
partition.cpp
+5 -1
View File
@@ -2061,7 +2061,11 @@ bool TWPartition::Wipe_EXTFS(string File_System) {
if (NeedPreserveFooter)
Length < 0 ? dev_sz += Length : dev_sz -= CRYPT_FOOTER_OFFSET;
string size_str = to_string(dev_sz / 4096);
char dout[16];
sprintf(dout, "%llu", dev_sz / 4096);
//string size_str =to_string(dev_sz / 4096);
string size_str = dout;
string Command;
gui_msg(Msg("formatting_using=Formatting {1} using {2}...")(Display_Name)("mke2fs"));