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/mtp/ffs/Android.mk b/mtp/ffs/Android.mk
old mode 100644
new mode 100755
index 9e75e0d..740afcb
--- a/mtp/ffs/Android.mk
+++ b/mtp/ffs/Android.mk
@@ -5,14 +5,17 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libtwrpmtp-ffs
LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasing -Wno-unused-variable -Wno-format -Wno-unused-parameter -Wno-unused-private-field
-LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic frameworks/base/include system/core/include bionic/libc/private/ bootable/recovery/twrplibusbhost/include
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
- LOCAL_C_INCLUDES += external/stlport/stlport
- LOCAL_SHARED_LIBRARIES += libstlport
-else
- LOCAL_SHARED_LIBRARIES += libc++
-endif
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasing \
+ -Wno-unused-variable -Wno-format -Wno-unused-parameter -Wno-unused-private-field \
+ -Wno-implicit-fallthrough
+LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic \
+ frameworks/base/include \
+ system/core/include \
+ bionic/libc/private/ \
+ bootable/recovery/twrplibusbhost/include \
+ bootable/recovery/install/include
+
+LOCAL_SHARED_LIBRARIES += libc++ libaosprecovery
LOCAL_SRC_FILES = \
MtpDataPacket.cpp \
@@ -54,7 +57,6 @@
libdl \
libcutils \
libutils \
- libaosprecovery \
libselinux \
libbase