From e9a135edde04b587245680b2199330392f806f9b Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Mon, 10 May 2021 13:52:35 -0400
Subject: [PATCH] troika: Cleanup

Change-Id: I9762c939670b4cce5903f9dc77bca0e58dbfce81
---
 BoardConfig.mk        | 18 +++++++++---------
 device.mk             |  5 +++--
 lineage_troika.mk     | 12 ++++++------
 proprietary-files.txt | 12 ++++++------
 vendor.prop           |  5 ++++-
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index c5d7803..e5e157b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 The LineageOS Project
+# Copyright (C) 2020-2021 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.
@@ -13,19 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# inherit from common
--include device/motorola/exynos9610-common/BoardConfigCommon.mk
+## Inherit from the common tree
+include device/motorola/exynos9610-common/BoardConfigCommon.mk
+
+## Inherit from the proprietary configuration
+include vendor/motorola/troika/BoardConfigVendor.mk
 
 DEVICE_PATH := device/motorola/troika
 
-# Assert
+## Assert
 TARGET_OTA_ASSERT_DEVICE := troika,one_action
 
-# Kernel
+## Kernel
 TARGET_KERNEL_CONFIG := troika_defconfig
 
-# Properties
+## Properties
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
-
-# inherit from the proprietary version
-include vendor/motorola/troika/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index b94db3b..44399af 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 The LineageOS Project
+# Copyright (C) 2020-2021 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.
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-# Inherit from common
+# Inherit from the common tree
 $(call inherit-product, device/motorola/exynos9610-common/common.mk)
 
+# Inherit proprietary files
 $(call inherit-product, vendor/motorola/troika/troika-vendor.mk)
diff --git a/lineage_troika.mk b/lineage_troika.mk
index cbde8d2..3265043 100644
--- a/lineage_troika.mk
+++ b/lineage_troika.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 The LineageOS Project
+# Copyright (C) 2020-2021 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.
@@ -14,18 +14,18 @@
 # limitations under the License.
 #
 
-# Inherit from those products. Most specific first.
+## Inherit from generic products, most specific first
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
-# Inherit from troika device
+## Inherit from troika device
 $(call inherit-product, device/motorola/troika/device.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit some common Lineage stuff.
+## Inherit some common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-# Device identifier. This must come after all inclusions
+## Device identifier, this must come after all inclusions
 PRODUCT_DEVICE := troika
 PRODUCT_NAME := lineage_troika
 PRODUCT_BRAND := Motorola
@@ -34,7 +34,7 @@ PRODUCT_MANUFACTURER := Motorola
 
 PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
-# Use the latest approved GMS identifiers
+## Use the latest CTS approved build identifiers
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME=troika_sprout \
     PRIVATE_BUILD_DESC="10/QSBS30.62-29-7/0ea60:user/release-keys"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c5e3363..9c7e35b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,12 +1,12 @@
-# Device proprietary files - from motorola/troika_retail/troika_sprout:10/QSBS30.62-29-11-5/db5cb, unless pinned
+## Device proprietary files - from motorola/troika_retail/troika_sprout:10/QSBS30.62-29-11-5/db5cb, unless pinned
 
-# camera
+## Camera
 vendor/lib/hw/camera.exynos9610.so
 vendor/lib/libexynoscamera3.so
 vendor/lib64/hw/camera.exynos9610.so
 vendor/lib64/libexynoscamera3.so
 
-# firmware
+## Firmware
 vendor/firmware/fimc_is_lib.bin
 vendor/firmware/fimc_is_rta.bin
 vendor/firmware/himax-hix83112a-hx83112a-0C00-208-troika.bin
@@ -25,16 +25,16 @@ vendor/firmware/setfile_12a10ff.bin
 vendor/firmware/setfile_16885c.bin
 vendor/firmware/setfile_5e9_troika.bin
 
-# NFC
+## NFC
 vendor/etc/sec_s3nrn81_rfreg.bin
 
-# sensors
+## Sensors
 vendor/lib/hw/sensors.troika_sprout.so
 vendor/lib/sensors.chub.so
 vendor/lib64/hw/sensors.troika_sprout.so
 vendor/lib64/sensors.chub.so
 
-# ril
+## RIL
 vendor/lib/libril_sitril.so
 vendor/lib/libsitril.so
 vendor/lib64/libril_sitril.so
diff --git a/vendor.prop b/vendor.prop
index e702daa..0ce82c5 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,2 +1,5 @@
-ro.hardware.sensors=troika_sprout
+## IMEI
 ro.radio.imei.sv=13
+
+## Sensors
+ro.hardware.sensors=troika_sprout
-- 
2.20.1