summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data.cpp6
-rw-r--r--minui/events.cpp1
-rw-r--r--prebuilt/Android.mk3
3 files changed, 6 insertions, 4 deletions
diff --git a/data.cpp b/data.cpp
index 978cefea0..d9239a473 100644
--- a/data.cpp
+++ b/data.cpp
@@ -767,10 +767,10 @@ void DataManager::SetDefaultValues()
mPersist.SetValue("tw_military_time", "0");
#ifdef TW_INCLUDE_CRYPTO
- mConst.SetValue(TW_USE_SHA2, "1");
- mConst.SetValue(TW_NO_SHA2, "0");
+ mPersist.SetValue(TW_USE_SHA2, "1");
+ mPersist.SetValue(TW_NO_SHA2, "0");
#else
- mConst.SetValue(TW_NO_SHA2, "1");
+ mPersist.SetValue(TW_NO_SHA2, "1");
#endif
#ifdef TW_NO_SCREEN_TIMEOUT
diff --git a/minui/events.cpp b/minui/events.cpp
index f67684b8b..c7779961a 100644
--- a/minui/events.cpp
+++ b/minui/events.cpp
@@ -24,7 +24,6 @@
#include <sys/epoll.h>
#include <sys/ioctl.h>
#include <unistd.h>
-#include <errno.h>
#include <functional>
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 8471ffba1..e28becd47 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -63,6 +63,9 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_e2p.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2fs.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_profile.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_uuid.so
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?),0)
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_misc.so
+endif
ifneq ($(wildcard external/e2fsprogs/lib/quota/Android.mk),)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_quota.so
endif