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/toybox/Android.mk b/toybox/Android.mk
old mode 100644
new mode 100755
index 5f6edec..0fb345d
--- a/toybox/Android.mk
+++ b/toybox/Android.mk
@@ -553,6 +553,10 @@
stop \
stty
endif
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 28; echo $$?),0)
+ALL_TOOLS += \
+ dd
+endif
endif
# Account for master branch changes pulld into CM14.1
ifneq ($(CM_BUILD),)
@@ -569,7 +573,9 @@
endif
# Install the symlinks.
-LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/$(t);)
+# LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/$(t);)
+LOCAL_POST_INSTALL_CMD := $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/$(t);)
+
include $(BUILD_EXECUTABLE)