hero2lte: Bringup for OrangeFox

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

Android.mk

@@ -1,11 +1,11 @@
 #
-# Copyright 2012 The Android Open Source Project
+# 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
+# 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,
@@ -14,19 +14,8 @@
 # limitations under the License.
 #
 
-# This contains the module build definitions for the hardware-specific
-# components for this device.
-#
-# As much as possible, those components should be built unconditionally,
-# with device-specific names to avoid collisions, to avoid device-specific
-# bitrot and build breakages. Building a component unconditionally does
-# *not* include it on all devices, so it is safe even with hardware-specific
-# components.
-
-ifneq ($(filter hero2lte,$(TARGET_DEVICE)),)
-
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
+ifeq ($(TARGET_DEVICE),hero2lte)
+include $(call all-subdir-makefiles,$(LOCAL_PATH))
 endif

AndroidProducts.mk

@@ -1 +1,21 @@
-PRODUCT_MAKEFILES := $(LOCAL_DIR)/omni_hero2lte.mk
+#
+# 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.
+#
+
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/omni_hero2lte.mk
+
+COMMON_LUNCH_CHOICES := \
+    omni_hero2lte-eng

BoardConfig.mk

@@ -1,12 +1,20 @@
-DEVICE_TREE := device/samsung/hero2lte
+#
+# 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.
+#
 
-# Bootloader
-BOARD_VENDOR := samsung
-TARGET_BOARD_PLATFORM := exynos5
-TARGET_SOC := exynos8890
-TARGET_BOOTLOADER_BOARD_NAME := universal8890
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_RADIOIMAGE := true
+DEVICE_PATH := device/samsung/hero2lte
 
 # Architecture
 TARGET_ARCH := arm64
@@ -23,23 +31,40 @@ TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := cortex-a53
 
 # Kernel
-LZMA_COMPRESSION := -9
-LZMA_RAMDISK_TARGETS := recovery
-TARGET_PREBUILT_KERNEL := $(DEVICE_TREE)/kernel
+TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel
 BOARD_KERNEL_BASE := 0x10000000
 BOARD_KERNEL_PAGESIZE := 2048
-BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 --tags_offset 0x00000100 --dt $(DEVICE_TREE)/dt.img
+BOARD_MKBOOTIMG_ARGS := \
+	--kernel_offset 0x00008000 \
+	--ramdisk_offset 0x01000000 \
+	--tags_offset 0x00000100 \
+	--dt $(DEVICE_PATH)/prebuilt/dt.img
+
+# Bootloader
+TARGET_NO_BOOTLOADER := true
+TARGET_BOOTLOADER_BOARD_NAME := universal8890
+
+# Platform
+TARGET_BOARD_PLATFORM := exynos5
 
 # File systems
 BOARD_HAS_LARGE_FILESYSTEM := true
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 
-# TWRP specific build flags
-RECOVERY_VARIANT := twrp
-TW_THEME := portrait_hdpi
+# Crypto
+TW_INCLUDE_CRYPTO := true
+TW_INCLUDE_CRYPTO_FBE := true
+
+# Recovery
+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
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/15400000.usb/15400000.dwc3/gadget/lun%d/file"
 TW_BRIGHTNESS_PATH := "/sys/devices/13900000.dsim/backlight/panel/brightness"
 TW_MAX_BRIGHTNESS := 255
@@ -53,35 +78,4 @@ BOARD_HAS_NO_REAL_SDCARD := true
 TW_EXCLUDE_TWRPAPP := true
 TW_FORCE_USE_BUSYBOX := true
 TW_INCLUDE_RESETPROP := true
-TW_DEVICE_VERSION := MoRo-1.6
-
-# Encryption support
-TW_INCLUDE_CRYPTO := true
-TW_INCLUDE_FBE := true
-
-# Asian region languages
 TW_EXTRA_LANGUAGES := true
-
-#SHRP_Variables
-SHRP_PATH := device/samsung/hero2lte
-SHRP_MAINTAINER := Morogoku
-SHRP_DEVICE_CODE := hero2lte
-SHRP_EDL_MODE := 0
-SHRP_EXTERNAL := /external_sd
-SHRP_INTERNAL := /sdcard
-SHRP_OTG := /usb-otg
-SHRP_FLASH := 1
-SHRP_CUSTOM_FLASHLIGHT := true
-SHRP_FONP_1 := /sys/devices/virtual/camera/flash/rear_flash
-SHRP_FONP_2 :=
-SHRP_FONP_3 :=
-SHRP_FLASH_MAX_BRIGHTNESS := 1
-SHRP_REC := /dev/block/platform/155a0000.ufs/by-name/RECOVERY
-SHRP_AB := false
-SHRP_REC_TYPE := Normal
-SHRP_DEVICE_TYPE := A_Only
-SHRP_EXPRESS := true
-SHRP_OFFICIAL := true
-SHRP_DARK := true
-SHRP_ALT_REBOOT := true
-

README.md

@@ -1,6 +1,7 @@
-# TWRP device tree for Samsung S7 Edge aka hero2lte
+# OrangeFox Recovery device tree for Samsung S7 Edge aka hero2lte
 
  Copyright (C) 2019 morogoku Open-source
+ Copyright (C) 2022 Sushrut1101 Open-source
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -14,25 +15,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
-
-Add to `.repo/local_manifests/hero2lte.xml`:
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <project name="SHRP-Devices/device_samsung_hero2lte" path="device/samsung/hero2lte" remote="github" revision="shrp" />
-</manifest>
-```
-
-Then run `repo sync` to check it out.
-
-To build:
-
-```sh
-export ALLOW_MISSING_DEPENDENCIES=true
-. build/envsetup.sh
-lunch omni_hero2lte-eng
-mka recoveryimage
 ```
 
 Kernel sources are available at: https://github.com/morogoku/android_kernel_samsung_universal8890/tree/twrp

mkbootimg.mk

@@ -1,79 +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.
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)
-ifneq ($(strip $(BOARD_KERNEL_PREBUILT_DT)),true)
-ifeq ($(strip $(BUILD_TINY_ANDROID)),true)
-include device/qcom/common/dtbtool/Android.mk
-endif
-
-ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)
-DTBTOOL_NAME := dtbToolLineage
-else
-DTBTOOL_NAME := $(TARGET_CUSTOM_DTBTOOL)
-endif
-
-DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX)
-
-INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img
-
-ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)
-# dtbToolCM will search subdirectories
-possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/
-else
-# Most specific paths must come first in possible_dtb_dirs
-possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/exynos/ $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/ $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/
-endif
-
-define build-dtimage-target
-    $(call pretty,"Target dt image: $@")
-    $(hide) for dir in $(possible_dtb_dirs); do \
-        if [ -d "$$dir" ]; then \
-            dtb_dir="$$dir"; \
-            break; \
-        fi; \
-    done; \
-    $(DTBTOOL) $(BOARD_DTBTOOL_ARGS) -o $@ -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ "$$dtb_dir";
-    $(hide) chmod a+r $@
-endef
-
-$(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET)
-	$(build-dtimage-target)
-	@echo "Made DT image: $@"
-
-.PHONY: dtimage
-dtimage: $(INSTALLED_DTIMAGE_TARGET)
-
-endif
-endif
-
-$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOTIMAGE_EXTRA_DEPS)
-	$(call pretty,"Target boot image: $@")
-	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@
-	$(hide) echo -n "SEANDROIDENFORCE" >> $@
-	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)
-	@echo "Made boot image: $@"
-
-FLASH_IMAGE_TARGET ?= $(PRODUCT_OUT)/recovery.tar
-
-$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel) $(RECOVERYIMAGE_EXTRA_DEPS)
-	@echo "----- Making recovery image ------"
-	$(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ --id > $(RECOVERYIMAGE_ID_FILE)
-	$(hide) echo -n "SEANDROIDENFORCE" >> $@
-	$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)
-	@echo "Made recovery image: $@"
-	$(hide) tar -C $(PRODUCT_OUT) -H ustar -c recovery.img > $(FLASH_IMAGE_TARGET)
-	@echo "Made Odin flashable recovery tar: ${FLASH_IMAGE_TARGET}"

omni.dependencies

@@ -1,4 +0,0 @@
-[
-
-]
-

omni_hero2lte.mk

@@ -1,3 +1,19 @@
+#
+# 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.
+#
+
 # Inherit from the common Open Source product configuration
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 

recovery/root/etc/flashlight/brightness

@@ -0,0 +1 @@
+/sys/devices/virtual/camera/flash/rear_flash

recovery/root/etc/flashlight/max_brightness

@@ -0,0 +1 @@
+1

recovery/root/fstab.samsungexynos8890

@@ -1,14 +0,0 @@
-# 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                                                                                wait
-/dev/block/platform/155a0000.ufs/by-name/CACHE          /cache      ext4    noatime,nosuid,nodev,noauto_da_alloc,discard,journal_async_commit,data=ordered,errors=panic    wait,check
-/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,encryptable=footer
-/dev/block/platform/155a0000.ufs/by-name/EFS            /efs        ext4    noatime,nosuid,nodev,noauto_da_alloc,discard,journal_async_commit,data=ordered,errors=panic    wait,check
-
-# VOLD
-/dev/block/platform/155a0000.ufs/by-name/HIDDEN          /preload    ext4    defaults    voldmanaged=preload:auto
-/devices/15740000.dwmmc2/mmc_host/mmc*                       auto    vfat    defaults    voldmanaged=sdcard:auto
-/devices/15400000.usb/15400000.dwc3/xhci-hcd.2.auto/usb*     auto    auto    defaults    voldmanaged=usb:auto

recovery/root/sbin/f2fs-cold.list

@@ -1,71 +0,0 @@
-# video
-avi
-divx
-flv
-m2ts
-m4p
-m4v
-mkv
-mov
-ts
-vob
-webm
-
-# audio
-aac
-ac3
-dts
-flac
-m4a
-mka
-wav
-
-# image
-bmp
-gif
-png
-svg
-webp
-
-# archive
-7z
-# a - there are many other file types starting with 'a'.
-deb
-gz
-iso
-jar
-lzma
-rar
-tgz
-txz
-udf
-xz
-zip
-
-# other
-pdf
-# Python bytecode
-pyc
-ttf
-ttc
-
-# common prefix
-# Covers jpg, jpeg, jp2
-jp
-# Covers mp3, mp4, mpeg, mpg
-mp
-# Covers oga, ogg, ogm, ogv
-og
-# Covers wma, wmb, wmv
-wm
-
-# android
-apk
-# Image alias
-cnt
-# YouTube
-exo
-# Android RunTime
-odex
-vdex
-so

recovery/root/sbin/f2fs-hot.list

@@ -1 +0,0 @@
-db

recovery/root/sbin/mkfs.f2fs

@@ -1,51 +0,0 @@
-#!/sbin/sh
-
-DEV=$(echo "$@" | tr ' ' '\n' | grep '/dev')
-OPTIONS="-f -O quota -w 4096 -R 0:0"
-
-echo "Executing /sbin/__mkfs.f2fs $OPTIONS $DEV"
-/sbin/__mkfs.f2fs $OPTIONS $DEV
-
-echo "Optimizing f2fs"
-mkdir -p /mnt
-mount $DEV /mnt
-
-find /sys/fs/f2fs* -name extension_list | while read list; do
-  echo "Updating extensions list for $list"
-
-  echo "Removing previous extensions list"
-
-  HOT=$(cat $list | grep -n 'hot file extension' | cut -d : -f 1)
-  COLD=$(($(cat $list | wc -l) - $HOT))
-
-  COLDLIST=$(head -n$(($HOT - 1)) $list | grep -v ':')
-  HOTLIST=$(tail -n$COLD $list)
-
-  echo $COLDLIST | tr ' ' '\n' | while read cold; do
-    echo "[c]!$cold"
-    echo "[c]!$cold" > $list
-  done
-
-  echo $HOTLIST | tr ' ' '\n' | while read hot; do
-    echo "[h]!$hot"
-    echo "[h]!$hot" > $list
-  done
-
-  echo "Writing new extensions list"
-
-  cat /sbin/f2fs-cold.list | grep -v '#' | while read cold; do
-    if [ ! -z $cold ]; then
-      echo "[c]$cold"
-      echo "[c]$cold" > $list
-    fi
-  done
-
-  cat /sbin/f2fs-hot.list | while read hot; do
-    if [ ! -z $hot ]; then
-      echo "[h]$hot"
-      echo "[h]$hot" > $list
-    fi
-  done
-done
-
-umount /mnt

recovery/root/sbin/sarsetup.sh

@@ -1,9 +0,0 @@
-#!/sbin/sh
-#
-# SAR Setup script
-# by morogoku
-#
-
-
-# Set ro.twrp.sar to false
-resetprop "ro.twrp.sar" "false"

vendorsetup.sh

@@ -1 +1,103 @@
-add_lunch_combo omni_hero2lte-eng
+FDEVICE="m20lte"
+
+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
+}
+
+if [ -z "$1" -a -z "$FOX_BUILD_DEVICE" ]; then
+   fox_get_target_device
+fi
+
+if [ "$1" = "$FDEVICE" -o "$FOX_BUILD_DEVICE" = "$FDEVICE" ]; then
+	# Base
+	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 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"
+	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
+	
+	# R11.1 Settings
+	export FOX_R11="1"
+	export FOX_VERSION="R11.1_0"
+	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
+
+	# 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
+fi