From 1a85468eff3a96e9702b083a5debe99595a34901 Mon Sep 17 00:00:00 2001
From: zlewchan <zlewchan@icloud.com>
Date: Sun, 8 Sep 2024 01:42:08 +0200
Subject: [PATCH] sm6225-common: Time for tequila!

---
 BoardConfigCommon.mk                          |  4 +--
 bengal.mk                                     |  6 +---
 .../lineage/res/res/values/config.xml         | 30 -------------------
 .../dialer/callrecord/res/values/config.xml   | 20 -------------
 .../app/src/main/res/values/config.xml        |  0
 lineage.dependencies => tequila.dependencies  |  4 +--
 6 files changed, 5 insertions(+), 59 deletions(-)
 delete mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 delete mode 100644 overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
 rename {overlay-lineage => overlay-tequila}/packages/apps/Aperture/app/src/main/res/values/config.xml (100%)
 rename lineage.dependencies => tequila.dependencies (50%)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ad9cf59..e0d89ed 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -57,7 +57,7 @@ LOC_HIDL_VERSION := 4.0
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     $(COMMON_PATH)/framework_compatibility_matrix.xml \
     hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
-    vendor/lineage/config/device_framework_matrix.xml
+    vendor/tequila/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 ODM_MANIFEST_FILES := $(COMMON_PATH)/manifest-qva.xml
@@ -123,7 +123,7 @@ TARGET_MODULE_ALIASES += \
     wlan.ko:qca_cld3_wlan.ko
 
 # Partitions
--include vendor/lineage/config/BoardConfigReservedSize.mk
+-include vendor/tequila/config/BoardConfigReservedSize.mk
 
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
 BOARD_USES_METADATA_PARTITION := true
diff --git a/bengal.mk b/bengal.mk
index a67a5d5..e0e0b8c 100644
--- a/bengal.mk
+++ b/bengal.mk
@@ -179,10 +179,6 @@ PRODUCT_PACKAGES += \
     ipacm \
     IPACM_cfg.xml
 
-# Lineage Health
-PRODUCT_PACKAGES += \
-    vendor.lineage.health-service.default
-
 # Media
 PRODUCT_PACKAGES += \
     libmm-omxcore \
@@ -213,7 +209,7 @@ PRODUCT_PACKAGES += \
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay-tequila
 
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index c9a8a04..0000000
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2019, 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Whether device has screen with higher aspect ratio -->
-    <bool name="config_haveHigherAspectRatioScreen">true</bool>
-
-    <!-- Defines the actions shown in advanced reboot submenu -->
-    <string-array name="config_restartActionsList">
-        <item>restart</item>
-        <item>restart_recovery</item>
-        <item>restart_fastboot</item>
-        <item>restart_bootloader</item>
-    </string-array>
-</resources>
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
deleted file mode 100644
index 4cacde5..0000000
--- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 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.
-     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.
--->
-<resources>
-    <bool name="call_recording_enabled">true</bool>
-    <integer name="call_recording_audio_source">4</integer>
-</resources>
diff --git a/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml b/overlay-tequila/packages/apps/Aperture/app/src/main/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
rename to overlay-tequila/packages/apps/Aperture/app/src/main/res/values/config.xml
diff --git a/lineage.dependencies b/tequila.dependencies
similarity index 50%
rename from lineage.dependencies
rename to tequila.dependencies
index a48acda..5814384 100644
--- a/lineage.dependencies
+++ b/tequila.dependencies
@@ -1,10 +1,10 @@
 [
   {
-    "repository": "android_hardware_motorola",
+    "repository": "platform_hardware_motorola",
     "target_path": "hardware/motorola"
   },
   {
-    "repository": "android_kernel_motorola_sm6225",
+    "repository": "platform_kernel_motorola_sm6225",
     "target_path": "kernel/motorola/sm6225"
   }
 ]