Browse Source

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

Change-Id: Ib119a9103d9b490b10e93f6b8ac0430266f6e102
Arian 10 months ago
parent
commit
131ccb3d5f
53 changed files with 34 additions and 34 deletions
  1. 8 8
      common.mk
  2. 1 1
      overlay/CarrierConfigResCommon/Android.bp
  3. 0 0
      overlay/CarrierConfigResCommon/AndroidManifest.xml
  4. 0 0
      overlay/CarrierConfigResCommon/res/xml/vendor.xml
  5. 1 1
      overlay/FrameworksResCommon/Android.bp
  6. 0 0
      overlay/FrameworksResCommon/AndroidManifest.xml
  7. 0 0
      overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml
  8. 0 0
      overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml
  9. 0 0
      overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml
  10. 0 0
      overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml
  11. 0 0
      overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml
  12. 0 0
      overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml
  13. 0 0
      overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml
  14. 0 0
      overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml
  15. 0 0
      overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml
  16. 0 0
      overlay/FrameworksResCommon/res/values-mcc454-mnc3/bools.xml
  17. 0 0
      overlay/FrameworksResCommon/res/values-mcc454-mnc4/bools.xml
  18. 0 0
      overlay/FrameworksResCommon/res/values-mcc455-mnc2/bools.xml
  19. 0 0
      overlay/FrameworksResCommon/res/values-mcc455-mnc7/bools.xml
  20. 0 0
      overlay/FrameworksResCommon/res/values-mcc460-mnc11/bools.xml
  21. 0 0
      overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml
  22. 0 0
      overlay/FrameworksResCommon/res/values-mcc460-mnc3/bools.xml
  23. 0 0
      overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml
  24. 0 0
      overlay/FrameworksResCommon/res/values/bools.xml
  25. 0 0
      overlay/FrameworksResCommon/res/values/config.xml
  26. 0 0
      overlay/FrameworksResCommon/res/values/config_telephony.xml
  27. 0 0
      overlay/FrameworksResCommon/res/values/required_apps_managed_device.xml
  28. 0 0
      overlay/FrameworksResCommon/res/values/strings.xml
  29. 0 10
      overlay/FrameworksResCommon_Sys/Android.bp
  30. 1 1
      overlay/FrameworksResTarget/Android.bp
  31. 0 0
      overlay/FrameworksResTarget/AndroidManifest.xml
  32. 0 0
      overlay/FrameworksResTarget/res/values/config.xml
  33. 0 0
      overlay/FrameworksResTarget/res/values/dimens.xml
  34. 0 0
      overlay/FrameworksResTarget/res/xml/power_profile.xml
  35. 1 1
      overlay/SettingsResCommon/Android.bp
  36. 0 0
      overlay/SettingsResCommon/AndroidManifest.xml
  37. 0 0
      overlay/SettingsResCommon/res/values/config.xml
  38. 0 0
      overlay/SettingsResCommon/res/values/strings.xml
  39. 1 1
      overlay/SystemUIResCommon/Android.bp
  40. 0 0
      overlay/SystemUIResCommon/AndroidManifest.xml
  41. 0 0
      overlay/SystemUIResCommon/res/values/config.xml
  42. 1 1
      overlay/TelecommResCommon/Android.bp
  43. 0 0
      overlay/TelecommResCommon/AndroidManifest.xml
  44. 0 0
      overlay/TelecommResCommon/res/values/config.xml
  45. 10 0
      overlay/TelephonyResCommon/Android.bp
  46. 0 0
      overlay/TelephonyResCommon/AndroidManifest.xml
  47. 0 0
      overlay/TelephonyResCommon/res/values/bools.xml
  48. 0 0
      overlay/TelephonyResCommon/res/values/config.xml
  49. 0 10
      overlay/TelephonyResCommon_Sys/Android.bp
  50. 10 0
      overlay/WifiResCommon/Android.bp
  51. 0 0
      overlay/WifiResCommon/AndroidManifest.xml
  52. 0 0
      overlay/WifiResCommon/res/values/bools.xml
  53. 0 0
      overlay/WifiResCommon/res/values/config.xml

+ 8 - 8
common.mk

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

+ 1 - 1
overlay/CarrierConfigResCommon_Sys/Android.bp → overlay/CarrierConfigResCommon/Android.bp

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

+ 0 - 0
overlay/CarrierConfigResCommon_Sys/AndroidManifest.xml → overlay/CarrierConfigResCommon/AndroidManifest.xml


+ 0 - 0
overlay/CarrierConfigResCommon_Sys/res/xml/vendor.xml → overlay/CarrierConfigResCommon/res/xml/vendor.xml


+ 1 - 1
overlay/SystemUIResCommon_Sys/Android.bp → overlay/FrameworksResCommon/Android.bp

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

+ 0 - 0
overlay/FrameworksResCommon_Sys/AndroidManifest.xml → overlay/FrameworksResCommon/AndroidManifest.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15/config.xml → overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2/config.xml → overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4/config.xml → overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9/config.xml → overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc120/config.xml → overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc260/config.xml → overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc4/config.xml → overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc410/config.xml → overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc311-mnc480/config.xml → overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc3/bools.xml → overlay/FrameworksResCommon/res/values-mcc454-mnc3/bools.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc4/bools.xml → overlay/FrameworksResCommon/res/values-mcc454-mnc4/bools.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc2/bools.xml → overlay/FrameworksResCommon/res/values-mcc455-mnc2/bools.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc7/bools.xml → overlay/FrameworksResCommon/res/values-mcc455-mnc7/bools.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/bools.xml → overlay/FrameworksResCommon/res/values-mcc460-mnc11/bools.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/config.xml → overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/bools.xml → overlay/FrameworksResCommon/res/values-mcc460-mnc3/bools.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/config.xml → overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values/bools.xml → overlay/FrameworksResCommon/res/values/bools.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values/config.xml → overlay/FrameworksResCommon/res/values/config.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values/config_telephony.xml → overlay/FrameworksResCommon/res/values/config_telephony.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values/required_apps_managed_device.xml → overlay/FrameworksResCommon/res/values/required_apps_managed_device.xml


+ 0 - 0
overlay/FrameworksResCommon_Sys/res/values/strings.xml → overlay/FrameworksResCommon/res/values/strings.xml


+ 0 - 10
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,
-}

+ 1 - 1
overlay/FrameworksResTarget_Vendor/Android.bp → overlay/FrameworksResTarget/Android.bp

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

+ 0 - 0
overlay/FrameworksResTarget_Vendor/AndroidManifest.xml → overlay/FrameworksResTarget/AndroidManifest.xml


+ 0 - 0
overlay/FrameworksResTarget_Vendor/res/values/config.xml → overlay/FrameworksResTarget/res/values/config.xml


+ 0 - 0
overlay/FrameworksResTarget_Vendor/res/values/dimens.xml → overlay/FrameworksResTarget/res/values/dimens.xml


+ 0 - 0
overlay/FrameworksResTarget_Vendor/res/xml/power_profile.xml → overlay/FrameworksResTarget/res/xml/power_profile.xml


+ 1 - 1
overlay/WifiResCommon_Sys/Android.bp → overlay/SettingsResCommon/Android.bp

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

+ 0 - 0
overlay/SettingsResCommon_Sys/AndroidManifest.xml → overlay/SettingsResCommon/AndroidManifest.xml


+ 0 - 0
overlay/SettingsResCommon_Sys/res/values/config.xml → overlay/SettingsResCommon/res/values/config.xml


+ 0 - 0
overlay/SettingsResCommon_Sys/res/values/strings.xml → overlay/SettingsResCommon/res/values/strings.xml


+ 1 - 1
overlay/TelecommResCommon_Sys/Android.bp → overlay/SystemUIResCommon/Android.bp

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

+ 0 - 0
overlay/SystemUIResCommon_Sys/AndroidManifest.xml → overlay/SystemUIResCommon/AndroidManifest.xml


+ 0 - 0
overlay/SystemUIResCommon_Sys/res/values/config.xml → overlay/SystemUIResCommon/res/values/config.xml


+ 1 - 1
overlay/SettingsResCommon_Sys/Android.bp → overlay/TelecommResCommon/Android.bp

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

+ 0 - 0
overlay/TelecommResCommon_Sys/AndroidManifest.xml → overlay/TelecommResCommon/AndroidManifest.xml


+ 0 - 0
overlay/TelecommResCommon_Sys/res/values/config.xml → overlay/TelecommResCommon/res/values/config.xml


+ 10 - 0
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,
+}

+ 0 - 0
overlay/TelephonyResCommon_Sys/AndroidManifest.xml → overlay/TelephonyResCommon/AndroidManifest.xml


+ 0 - 0
overlay/TelephonyResCommon_Sys/res/values/bools.xml → overlay/TelephonyResCommon/res/values/bools.xml


+ 0 - 0
overlay/TelephonyResCommon_Sys/res/values/config.xml → overlay/TelephonyResCommon/res/values/config.xml


+ 0 - 10
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,
-}

+ 10 - 0
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,
+}

+ 0 - 0
overlay/WifiResCommon_Sys/AndroidManifest.xml → overlay/WifiResCommon/AndroidManifest.xml


+ 0 - 0
overlay/WifiResCommon_Sys/res/values/bools.xml → overlay/WifiResCommon/res/values/bools.xml


+ 0 - 0
overlay/WifiResCommon_Sys/res/values/config.xml → overlay/WifiResCommon/res/values/config.xml