hero2lte: Initial Android 11 Changes

Signed-off-by: Sushrut1101 <guptasushrut@gmail.com>

AndroidProducts.mk

@@ -15,7 +15,7 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/omni_hero2lte.mk
+    $(LOCAL_DIR)/twrp_hero2lte.mk
 
 COMMON_LUNCH_CHOICES := \
-    omni_hero2lte-eng
+    twrp_hero2lte-eng

BoardConfig.mk

@@ -61,7 +61,6 @@ LZMA_COMPRESSION := -9
 LZMA_RAMDISK_TARGETS := recovery
 RECOVERY_SDCARD_ON_DATA := true
 TARGET_RECOVERY_PIXEL_FORMAT := "ABGR_8888"
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery.fstab
 
 # TWRP specific build flags
 TW_THEME := portrait_hdpi

device.mk

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2022 The OrangeFox Recovery 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.
+#
+
+LOCAL_PATH := device/samsung/hero2lte

recovery.fstab

@@ -1,16 +0,0 @@
-/boot			emmc	/dev/block/platform/155a0000.ufs/by-name/BOOT
-/recovery		emmc	/dev/block/platform/155a0000.ufs/by-name/RECOVERY	flags=backup=1
-/cache			ext4	/dev/block/platform/155a0000.ufs/by-name/CACHE
-
-/system			ext4	/dev/block/platform/155a0000.ufs/by-name/SYSTEM		flags=display="System";backup=1
-/system_image		emmc	/dev/block/platform/155a0000.ufs/by-name/SYSTEM		flags=display="System Image";backup=1
-/data			ext4	/dev/block/platform/155a0000.ufs/by-name/USERDATA	flags=encryptable=footer;length=-20480
-/storage		ext4	/data/media/0						flags=display="Internal Storage";usermrf;backup=1;fsflags="bind";removable
-/misc			emmc    /dev/block/platform/155a0000.ufs/by-name/OTA
-
-/modem			emmc	/dev/block/platform/155a0000.ufs/by-name/RADIO		flags=backup=1;display="Baseband"
-/modem_debug		emmc	/dev/block/platform/155a0000.ufs/by-name/CP_DEBUG	flags=backup=1;display="Baseband (Debug)";subpartitionof=/modem
-/efs			ext4	/dev/block/platform/155a0000.ufs/by-name/EFS		flags=backup=1;display="EFS"
-
-/sdcard1		vfat	/dev/block/mmcblk0p1	/dev/block/mmcblk0		flags=display="MicroSD Card";storage;wipeingui;removable
-/usb_otg		vfat	/dev/block/sde1		/dev/block/sde			flags=display="USB-Storage";storage;wipeingui;removable

recovery/root/system/etc/recovery.fstab

@@ -0,0 +1,11 @@
+# Android fstab file.
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+#<src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
+
+/dev/block/platform/155a0000.ufs/by-name/SYSTEM		/system		ext4		ro,errors=panic,noload												wait,recoveryonly
+
+/dev/block/platform/155a0000.ufs/by-name/USERDATA	/data		ext4		noatime,nosuid,nodev,noauto_da_alloc,discard,journal_async_commit,data=ordered,errors=panic			wait,check,quota,encryptable=/dev/block/platform/155a0000.ufs/by-name/TOMBSTONES,latemount,reservedsize=128M
+
+/dev/block/platform/155a0000.ufs/by-name/OTA		/misc		emmc		defaults													defaults

recovery/root/system/etc/twrp.flags

@@ -0,0 +1,22 @@
+# Android fstab file.
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+# mount_point		fstype		device			device2					flags
+
+/boot			emmc		/dev/block/platform/155a0000.ufs/by-name/BOOT
+/recovery		emmc		/dev/block/platform/155a0000.ufs/by-name/RECOVERY		flags=backup=1
+/cache			ext4		/dev/block/platform/155a0000.ufs/by-name/CACHE
+
+# Internal Storage
+/storage		ext4		/data/media/0							flags=display="Internal Storage";usermrf;backup=1;fsflags="bind";removable
+
+/system_image		emmc		/dev/block/platform/155a0000.ufs/by-name/SYSTEM			flags=display="System Image";backup=1
+
+/modem			emmc		/dev/block/platform/155a0000.ufs/by-name/RADIO			flags=backup=1;display="Baseband"
+/modem_debug		emmc		/dev/block/platform/155a0000.ufs/by-name/CP_DEBUG		flags=backup=1;display="Baseband (Debug)";subpartitionof=/modem
+/efs			ext4		/dev/block/platform/155a0000.ufs/by-name/EFS			flags=backup=1;display="EFS"
+
+# External Storage
+/sdcard1		vfat		/dev/block/mmcblk0p1	/dev/block/mmcblk0			flags=display="MicroSD Card";storage;wipeingui;removable
+/usb_otg		vfat		/dev/block/sde1		/dev/block/sde				flags=display="USB-Storage";storage;wipeingui;removable

omni_hero2lte.mk → twrp_hero2lte.mk

@@ -14,14 +14,18 @@
 # limitations under the License.
 #
 
-# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
 
 # Inherit from our custom product configuration
-$(call inherit-product, vendor/omni/config/common.mk)
+$(call inherit-product, vendor/twrp/config/common.mk)
 
-## Device identifier. This must come after all inclusions
+# Inherit from hero2lte device
+$(call inherit-product, device/samsung/hero2lte/device.mk)
+
+# Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := hero2lte
-PRODUCT_NAME := omni_hero2lte
+PRODUCT_NAME := twrp_hero2lte
 PRODUCT_BRAND := samsung
+PRODUCT_MODEL := SM-G935F
 PRODUCT_MANUFACTURER := samsung

vendorsetup.sh

@@ -14,106 +14,89 @@
 # limitations under the License.
 #
 
-FDEVICE="m20lte"
+FDEVICE="hero2lte"
 
 fox_get_target_device() {
-local chkdev=$(echo "$BASH_SOURCE" | grep $FDEVICE)
-   if [ -n "$chkdev" ]; then
-      FOX_BUILD_DEVICE="$FDEVICE"
-   else
-      chkdev=$(set | grep BASH_ARGV | grep $FDEVICE)
-      [ -n "$chkdev" ] && FOX_BUILD_DEVICE="$FDEVICE"
-   fi
+	local chkdev=$(echo "$BASH_SOURCE" | grep \"$FDEVICE\")
+	if [ -n "$chkdev" ]; then
+		FOX_BUILD_DEVICE="$FDEVICE"
+	else
+		chkdev=$(set | grep BASH_ARGV | grep \"$FDEVICE\")
+		[ -n "$chkdev" ] && FOX_BUILD_DEVICE="$FDEVICE"
+	fi
 }
 
 if [ -z "$1" -a -z "$FOX_BUILD_DEVICE" ]; then
-   fox_get_target_device
+	fox_get_target_device
 fi
 
 if [ "$1" = "$FDEVICE" -o "$FOX_BUILD_DEVICE" = "$FDEVICE" ]; then
-	# Base
+
+	# Basic Vars
 	export ALLOW_MISSING_DEPENDENCIES=true
 	export LC_ALL="C"
 	export FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER="1"
-	
-	# m20lte specific
-	export TARGET_DEVICE_ALT="m20lte"
+
+	export OF_PATCH_AVB20=1
+	export OF_USE_MAGISKBOOT=1
+	export OF_USE_MAGISKBOOT_FOR_ALL_PATCHES=1
+	export OF_DONT_PATCH_ENCRYPTED_DEVICE=1
+	export OF_NO_TREBLE_COMPATIBILITY_CHECK=1
+	export OF_NO_MIUI_PATCH_WARNING=1
+	export FOX_REPLACE_BUSYBOX_PS=1
+	export OF_USE_NEW_MAGISKBOOT=1
+	export OF_SKIP_MULTIUSER_FOLDERS_BACKUP=1
+	export OF_FBE_METADATA_MOUNT_IGNORE=1
+	export FOX_DELETE_AROMAFM=1
+	export OF_USE_SYSTEM_FINGERPRINT=1
+	export FOX_BUGGED_AOSP_ARB_WORKAROUND="1600876644"; # Wednesday, September 23 2020 19:07:11 BST
+	export FOX_USE_BASH_SHELL=1
+	export FOX_ASH_IS_BASH=1
+	export FOX_USE_NANO_EDITOR=1
+	export FOX_USE_TAR_BINARY=1
+	export FOX_USE_ZIP_BINARY=1
+	export FOX_USE_SED_BINARY=1
+	export FOX_USE_XZ_UTILS=1
+	export OF_USE_GREEN_LED=0
+
+	# OTA for custom ROMs
+	export OF_SUPPORT_ALL_BLOCK_OTA_UPDATES=1
+	export OF_FIX_OTA_UPDATE_MANUAL_FLASH_ERROR=1
+	export OF_DISABLE_MIUI_OTA_BY_DEFAULT=1
+
+	# Quick backup defaults
+	export OF_QUICK_BACKUP_LIST="/boot;/data;/system_image;"
+
+	# Exynos ($FDEVICE) Specific
 	export FOX_RECOVERY_INSTALL_PARTITION="/dev/block/platform/155a0000.ufs/by-name/RECOVERY"
 	export FOX_RECOVERY_SYSTEM_PARTITION="/dev/block/platform/155a0000.ufs/by-name/SYSTEM"
-	export FOX_RECOVERY_VENDOR_PARTITION="/dev/block/platform/155a0000.ufs/by-name/VENDOR"
+	# FOX_RECOVERY_VENDOR_PARTITION is not set as the device is non-treble
 	export FOX_RECOVERY_BOOT_PARTITION="/dev/block/platform/155a0000.ufs/by-name/BOOT"
-	export OF_FLASHLIGHT_ENABLE="1"
-	export OF_FL_PATH1="/etc/flashlight"
-	export OF_DEVICE_WITHOUT_PERSIST=1
-	
+	export OF_FL_PATH1="/system/flashlight"
+	export OF_DEVICE_WITHOUT_PERSIST="1"
+
 	# R11.1 Settings
 	export FOX_R11="1"
-	export FOX_VERSION="R11.1_0"
+	export FOX_VERSION="R11.1_1"
 	export OF_MAINTAINER="Sushrut1101"
-	export OF_MAINTAINER_AVATAR="misc/Sushrut1101.png"
-	
-	export FOX_ADVANCED_SECURITY="1"
-	export OF_USE_TWRP_SAR_DETECT="1"
-	export OF_SUPPORT_ALL_BLOCK_OTA_UPDATES=1
-	export OF_DISABLE_MIUI_OTA_BY_DEFAULT=0
-	export OF_FIX_OTA_UPDATE_MANUAL_FLASH_ERROR=1
-	export OF_OTA_BACKUP_STOCK_BOOT_IMAGE=1
 
-	# Quick Backup Defaults
-	export OF_QUICK_BACKUP_LIST="/boot;/data;/system_image;/vendor_image;"
-	
-	# Common
-	export TARGET_ARCH=arm64
-	export TW_DEFAULT_LANGUAGE="en"
-	export OF_KEEP_FORCED_ENCRYPTION="1"
-	export OF_PATCH_AVB20="1"
-	export OF_USE_MAGISKBOOT="1"
-	export OF_USE_MAGISKBOOT_FOR_ALL_PATCHES="1"
-	export OF_DONT_PATCH_ENCRYPTED_DEVICE="1"
-	export OF_NO_TREBLE_COMPATIBILITY_CHECK="1"
-	export FOX_USE_LZMA_COMPRESSION="1"
-	
-	export FOX_USE_BASH_SHELL="1"
-	export FOX_ASH_IS_BASH="1"
-	export FOX_USE_NANO_EDITOR="1"
-	export FOX_USE_TAR_BINARY="1"
-	export FOX_USE_ZIP_BINARY="1"
-	export FOX_REPLACE_BUSYBOX_PS="1"
-	export OF_USE_NEW_MAGISKBOOT="1"
-	export OF_SKIP_MULTIUSER_FOLDERS_BACKUP="1"
-	
-	# Use the System (ROM) Fingerprint where Available
-	export OF_USE_SYSTEM_FINGERPRINT="1"
-	
-	# Create Odin Flashable .tar files
-	export OF_NO_SAMSUNG_SPECIAL=0
-	
-	# OF_MAINTAINER_AVATAR Setup
-    if [ -n "$OF_MAINTAINER_AVATAR" ]; then
-        if [ ! -f "$OF_MAINTAINER_AVATAR" ]; then
-              # some colour codes
-              RED='\033[0;31m'
-              GREEN='\033[0;32m'
-              ORANGE='\033[0;33m'
-              BLUE='\033[0;34m'
-              PURPLE='\033[0;35m'
-              echo -e "${RED}-- File \"$OF_MAINTAINER_AVATAR\" not found  ...${NC}"
-              echo -e "${ORANGE}-- Downloading...${NC}"
-              mkdir -p misc
-              curl https://raw.githubusercontent.com/OrangeFoxRecovery/avatar/fox/Sushrut1101.png >> $OF_MAINTAINER_AVATAR
-              echo -e "${BLUE}-- Successfully Downloaded the Avatar Image \"$OF_MAINTAINER_AVATAR\" ...${NC}"
-              echo -e "${PURPLE}-- Using A Custom Maintainer Avatar from the Downloaded Image \"$OF_MAINTAINER_AVATAR\" ...${NC}"
-              echo -e "${GREEN}-- Done!"
-        fi
-    fi
+	# Magisk
+	export FOX_USE_SPECIFIC_MAGISK_ZIP=~/Magisk/Magisk.zip
+	if [ -n "${FOX_USE_SPECIFIC_MAGISK_ZIP}" ]; then
+		if [ ! -e "${FOX_USE_SPECIFIC_MAGISK_ZIP}" ]; then
+			echo "Downloading the Latest Release of Magisk..."
+			LATEST_MAGISK_URL="$(curl -sL https://api.github.com/repos/topjohnwu/Magisk/releases/latest | grep browser_download_url | grep Magisk- | cut -d : -f 2,3 | sed 's/"//g')"
+			wget -q ${LATEST_MAGISK_URL} -O ${FOX_USE_SPECIFIC_MAGISK_ZIP} || wget ${LATEST_MAGISK_URL} -O ${FOX_USE_SPECIFIC_MAGISK_ZIP}
+			[ "$?" = "0" ] && echo "Magisk Downloaded Successfully"
+			echo "Done!"
+		fi
+	fi
 
-	# Let's See what are our Build VARs
+	# let's see what are our build VARs
 	if [ -n "$FOX_BUILD_LOG_FILE" -a -f "$FOX_BUILD_LOG_FILE" ]; then
-  	   export | grep "FOX" >> $FOX_BUILD_LOG_FILE
-  	   export | grep "OF_" >> $FOX_BUILD_LOG_FILE
-   	   export | grep "TARGET_" >> $FOX_BUILD_LOG_FILE
-  	   export | grep "TW_" >> $FOX_BUILD_LOG_FILE
- 	fi
-
-	add_lunch_combo omni_"$FDEVICE"-eng
+		export | grep "FOX" >> $FOX_BUILD_LOG_FILE
+		export | grep "OF_" >> $FOX_BUILD_LOG_FILE
+		export | grep "TARGET_" >> $FOX_BUILD_LOG_FILE
+		export | grep "TW_" >> $FOX_BUILD_LOG_FILE
+	fi
 fi