AOSP10 TWRP Merge: fix conflicts and update libraries needed
This allows flame to boot TWRP. Still will need to work on
super partition for vendor and system access.
The plan will be to cherry-pick any updates to android-9.0
through gerrit.twrp.me to this branch as a WIP.
diff --git a/bmlutils/Android.mk b/bmlutils/Android.mk
index 7216775..9cbada0 100644
--- a/bmlutils/Android.mk
+++ b/bmlutils/Android.mk
@@ -13,7 +13,7 @@
LOCAL_SRC_FILES := bmlutils.c
LOCAL_MODULE := libbmlutils
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)
#Added for building TWRP dynamic:
@@ -30,5 +30,5 @@
LOCAL_SRC_FILES := bmlutils.c
LOCAL_MODULE := libbmlutils
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)