cap_sprout: fixed device name and vendor

Signed-off-by: Carlo Dee <carlodee.official@proton.me>

Android.mk

@@ -7,6 +7,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),CAP_sprout)
+ifeq ($(TARGET_DEVICE),cap_sprout)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
 endif

AndroidProducts.mk

@@ -6,9 +6,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/omni_CAP_sprout.mk
+    $(LOCAL_DIR)/twrp_cap_sprout.mk
 
 COMMON_LUNCH_CHOICES := \
-    omni_CAP_sprout-user \
-    omni_CAP_sprout-userdebug \
-    omni_CAP_sprout-eng
+    twrp_cap_sprout-user \
+    twrp_cap_sprout-userdebug \
+    twrp_cap_sprout-eng

BoardConfig.mk

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/hmd/CAP_sprout
+DEVICE_PATH := device/nokia/cap_sprout
 
 # For building with minimal manifest
 ALLOW_MISSING_DEPENDENCIES := true
@@ -54,8 +54,8 @@ BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_KERNEL_TAGS_OFFSET)
 BOARD_KERNEL_IMAGE_NAME := Image
 BOARD_INCLUDE_DTB_IN_BOOTIMG := true
 BOARD_KERNEL_SEPARATED_DTBO := true
-TARGET_KERNEL_CONFIG := CAP_sprout_defconfig
-TARGET_KERNEL_SOURCE := kernel/hmd/CAP_sprout
+TARGET_KERNEL_CONFIG := cap_sprout_defconfig
+TARGET_KERNEL_SOURCE := kernel/nokia/cap_sprout
 
 # Kernel - prebuilt
 TARGET_FORCE_PREBUILT_KERNEL := true
@@ -78,9 +78,9 @@ BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_VENDOR := vendor
 BOARD_SUPER_PARTITION_SIZE := 9126805504 # TODO: Fix hardcoded value
-BOARD_SUPER_PARTITION_GROUPS := hmd_dynamic_partitions
-BOARD_HMD_DYNAMIC_PARTITIONS_PARTITION_LIST := system system_ext product vendor
-BOARD_HMD_DYNAMIC_PARTITIONS_SIZE := 9122611200 # TODO: Fix hardcoded value
+BOARD_SUPER_PARTITION_GROUPS := nokia_dynamic_partitions
+BOARD_NOKIA_DYNAMIC_PARTITIONS_PARTITION_LIST := system system_ext product vendor
+BOARD_NOKIA_DYNAMIC_PARTITIONS_SIZE := 9122611200 # TODO: Fix hardcoded value
 
 # Platform
 TARGET_BOARD_PLATFORM := trinket

README.md

@@ -1,4 +1,4 @@
-# Android device tree for Nokia Nokia 5.3 (CAP_sprout)
+# Android device tree for Nokia 5.3 (cap_sprout)
 
 ```
 #

device.mk

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-LOCAL_PATH := device/hmd/CAP_sprout
+LOCAL_PATH := device/nokia/cap_sprout
 # A/B
 AB_OTA_POSTINSTALL_CONFIG += \
     RUN_POSTINSTALL_system=true \

extract-files.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=CAP_sprout
-VENDOR=hmd
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../.."
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-# Default to sanitizing the vendor folder before extraction
-CLEAN_VENDOR=true
-
-KANG=
-SECTION=
-
-while [ "${#}" -gt 0 ]; do
-    case "${1}" in
-        -n | --no-cleanup )
-                CLEAN_VENDOR=false
-                ;;
-        -k | --kang )
-                KANG="--kang"
-                ;;
-        -s | --section )
-                SECTION="${2}"; shift
-                CLEAN_VENDOR=false
-                ;;
-        * )
-                SRC="${1}"
-                ;;
-    esac
-    shift
-done
-
-if [ -z "${SRC}" ]; then
-    SRC="adb"
-fi
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
-
-extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-
-"${MY_DIR}/setup-makefiles.sh"

setup-makefiles.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=CAP_sprout
-VENDOR=hmd
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../.."
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
-
-# Warning headers and guards
-write_headers
-
-write_makefiles "${MY_DIR}/proprietary-files.txt" true
-
-# Finish
-write_footers

omni_CAP_sprout.mk → twrp_cap_sprout.mk

@@ -9,21 +9,21 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit some common Omni stuff.
-$(call inherit-product, vendor/omni/config/common.mk)
+# Inherit some common twrp stuff.
+$(call inherit-product, vendor/twrp/config/common.mk)
 
-# Inherit from CAP_sprout device
-$(call inherit-product, device/hmd/CAP_sprout/device.mk)
+# Inherit from cap_sprout device
+$(call inherit-product, device/nokia/cap_sprout/device.mk)
 
-PRODUCT_DEVICE := CAP_sprout
-PRODUCT_NAME := omni_CAP_sprout
+PRODUCT_DEVICE := cap_sprout
+PRODUCT_NAME := twrp_cap_sprout
 PRODUCT_BRAND := Nokia
 PRODUCT_MODEL := Nokia 5.3
-PRODUCT_MANUFACTURER := hmd
+PRODUCT_MANUFACTURER := nokia
 
-PRODUCT_GMS_CLIENTID_BASE := android-hmd
+PRODUCT_GMS_CLIENTID_BASE := android-nokia
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRIVATE_BUILD_DESC="trinket-user 11 RKQ1.211130.001 1 release-keys"
 
-BUILD_FINGERPRINT := Nokia/CaptainAmerica_00WW/CAP_sprout:11/RKQ1.211130.001/00WW_3_40A:user/release-keys
+BUILD_FINGERPRINT := Nokia/CaptainAmerica_00WW/cap_sprout:11/RKQ1.211130.001/00WW_3_40A:user/release-keys

vendorsetup.sh

@@ -5,6 +5,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-add_lunch_combo omni_CAP_sprout-user
-add_lunch_combo omni_CAP_sprout-userdebug
-add_lunch_combo omni_CAP_sprout-eng
+# Reserved