From 0d2b8a593a23948b39ac0d6e46ed837a97ae84d4 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Sat, 5 Sep 2020 11:27:06 -0600 Subject: [PATCH] Revert "matisse-common: Add support for TWRP" * Kind of don't care about it anymore. We have Lineage Recovery This reverts commit b7d9a63fa52b6a92814d22f6b319c64ba3d8ea96. This reverts commit d8ff0658d07e55bb6e73bae8d99344a2da9dc534. Change-Id: I13e3c02c48138c0ad621b713ae5c7b0a5ec67e22 --- BoardConfigCommon.mk | 5 ----- twrp.mk | 30 ------------------------------ twrp/recovery/root/etc/twrp.fstab | 15 --------------- 3 files changed, 50 deletions(-) delete mode 100644 twrp.mk delete mode 100644 twrp/recovery/root/etc/twrp.fstab diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f14762c..551a835 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -112,11 +112,6 @@ include $(COMMON_PATH)/sepolicy/sepolicy.mk # Sensors TARGET_NO_SENSOR_PERMISSION_CHECK := true -# TWRP Support - Optional -ifeq ($(WITH_TWRP),true) --include $(COMMON_PATH)/twrp.mk -endif - # Use Snapdragon LLVM if available on build server TARGET_USE_SDCLANG := true diff --git a/twrp.mk b/twrp.mk deleted file mode 100644 index 484c2b8..0000000 --- a/twrp.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2017 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -TARGET_RECOVERY_DEVICE_DIRS += $(COMMON_PATH)/twrp - -RECOVERY_SDCARD_ON_DATA := true -TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888" -TARGET_RECOVERY_QCOM_RTC_FIX := true -TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/msm_hsusb/gadget/lun%d/file" -TW_BRIGHTNESS_PATH := "/sys/class/leds/lcd-backlight/brightness" -TW_DEFAULT_BRIGHTNESS := 162 -TW_HAS_DOWNLOAD_MODE := true -TW_INCLUDE_CRYPTO := true -TW_MAX_BRIGHTNESS := 255 -TW_MTP_DEVICE := "/dev/mtp_usb" -TW_NO_EXFAT_FUSE := true -TW_NO_LEGACY_PROPS := true -TW_NO_REBOOT_BOOTLOADER := true -TW_THEME := portrait_hdpi diff --git a/twrp/recovery/root/etc/twrp.fstab b/twrp/recovery/root/etc/twrp.fstab deleted file mode 100644 index 4c0dfe3..0000000 --- a/twrp/recovery/root/etc/twrp.fstab +++ /dev/null @@ -1,15 +0,0 @@ -/boot emmc /dev/block/platform/msm_sdcc.1/by-name/boot -/recovery emmc /dev/block/platform/msm_sdcc.1/by-name/recovery flags=backup=1 -/system ext4 /dev/block/platform/msm_sdcc.1/by-name/system -/data ext4 /dev/block/platform/msm_sdcc.1/by-name/userdata length=-16384 -/cache ext4 /dev/block/platform/msm_sdcc.1/by-name/cache -/efs1 emmc /dev/block/platform/msm_sdcc.1/by-name/efs flags=backup=1;display=EFS -/efs2 emmc /dev/block/platform/msm_sdcc.1/by-name/modemst1 flags=backup=1;subpartitionof=/efs1 -/efs3 emmc /dev/block/platform/msm_sdcc.1/by-name/modemst2 flags=backup=1;subpartitionof=/efs1 -/external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SDcard";storage;wipeingui;removable -/modem emmc /dev/block/platform/msm_sdcc.1/by-name/modem flags=backup=1;display="Modem" -/preload ext4 /dev/block/mmcblk0p25 flags=display="Preload";wipeingui;backup=1 -/misc emmc /dev/block/platform/msm_sdcc.1/by-name/fota flags=display="Misc" - -/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="MicroSD";storage;wipeingui;removable -/usb-otg auto /dev/block/sda1 /dev/block/sda flags=display="USB OTG";storage;wipeingui;removable