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/injecttwrp/Android.mk b/injecttwrp/Android.mk
index 2557523..d7f7936 100644
--- a/injecttwrp/Android.mk
+++ b/injecttwrp/Android.mk
@@ -6,7 +6,7 @@
injecttwrp.c
LOCAL_CFLAGS:= -g -c -W
LOCAL_MODULE:=injecttwrp
- LOCAL_MODULE_TAGS:= eng
+ LOCAL_MODULE_TAGS:= optional
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
include $(BUILD_EXECUTABLE)