sm8450-common: overlay: Remove _Sys and _Vendor suffix from names

Change-Id: Ib119a9103d9b490b10e93f6b8ac0430266f6e102

common.mk

@@ -362,17 +362,17 @@ $(foreach sku_out, $(TARGET_COPY_OUT_NFC_SKU_PERMISSIONS), \
 
 # Overlays
 PRODUCT_PACKAGES += \
-    CarrierConfigResCommon_Sys \
+    CarrierConfigResCommon \
-    FrameworksResCommon_Sys \
+    FrameworksResCommon \
-    SettingsResCommon_Sys \
+    SettingsResCommon \
-    SystemUIResCommon_Sys \
+    SystemUIResCommon \
-    TelecommResCommon_Sys \
+    TelecommResCommon \
-    TelephonyResCommon_Sys \
+    TelephonyResCommon \
-    WifiResCommon_Sys
+    WifiResCommon
 
 PRODUCT_PACKAGES += \
     DialerResXiaomi \
-    FrameworksResTarget_Vendor \
+    FrameworksResTarget \
     FrameworksResXiaomi \
     SettingsProviderResXiaomi \
     SettingsResXiaomi \

overlay/CarrierConfigResCommon/Android.bp

@@ -5,7 +5,7 @@
 //
 
 runtime_resource_overlay {
-    name: "CarrierConfigResCommon_Sys",
+    name: "CarrierConfigResCommon",
     product_specific: true,
     aaptflags: ["--keep-raw-values"],
 }

overlay/FrameworksResCommon/Android.bp

@@ -5,6 +5,6 @@
 //
 
 runtime_resource_overlay {
-    name: "SystemUIResCommon_Sys",
+    name: "FrameworksResCommon",
     product_specific: true,
 }

overlay/FrameworksResCommon_Sys/Android.bp

@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2024 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "FrameworksResCommon_Sys",
-    product_specific: true,
-}

overlay/FrameworksResTarget/Android.bp

@@ -5,6 +5,6 @@
 //
 
 runtime_resource_overlay {
-    name: "FrameworksResTarget_Vendor",
+    name: "FrameworksResTarget",
     vendor: true,
 }

overlay/SettingsResCommon/Android.bp

@@ -5,6 +5,6 @@
 //
 
 runtime_resource_overlay {
-    name: "WifiResCommon_Sys",
+    name: "SettingsResCommon",
     product_specific: true,
 }

overlay/SystemUIResCommon/Android.bp

@@ -5,6 +5,6 @@
 //
 
 runtime_resource_overlay {
-    name: "TelecommResCommon_Sys",
+    name: "SystemUIResCommon",
     product_specific: true,
 }

overlay/TelecommResCommon/Android.bp

@@ -5,6 +5,6 @@
 //
 
 runtime_resource_overlay {
-    name: "SettingsResCommon_Sys",
+    name: "TelecommResCommon",
     product_specific: true,
 }

overlay/TelephonyResCommon/Android.bp

@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2024 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "TelephonyResCommon",
+    product_specific: true,
+}

overlay/TelephonyResCommon_Sys/Android.bp

@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2024 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "TelephonyResCommon_Sys",
-    product_specific: true,
-}

overlay/WifiResCommon/Android.bp

@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2024 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "WifiResCommon",
+    product_specific: true,
+}