commit cbd8cc5e06656a40f45b78adbb988b59564cb17a
author big biff <bigbiff@teamw.in> Mon Dec 24 01:45:46 2018 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Mon Dec 24 01:45:46 2018 +0100
tree a9cfc4d4139549bdfeff66e4fe30d1d847375a6d
parent 47802863463ccb1fe9afe640f0e08c2223dcf338
parent fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda

Merge "Add option to use ro.serialno for generating device id" into android-9.0

data.cpp

diff --git a/data.cpp b/data.cpp
index 978cefe..d9239a4 100644
--- a/data.cpp
+++ b/data.cpp
@@ -767,10 +767,10 @@
 	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

minui/events.cpp

diff --git a/minui/events.cpp b/minui/events.cpp
index f67684b..c777996 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>
 

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 8471ffb..e28becd 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -63,6 +63,9 @@
 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