diff --git a/common.mk b/common.mk index c7e7a68..8d50cdf 100644 --- a/common.mk +++ b/common.mk @@ -67,13 +67,13 @@ PRODUCT_COPY_FILES += \ # Overlays PRODUCT_PACKAGES += \ - CarrierConfigResCommon \ - FrameworksResCommon \ - SettingsResCommon \ - SystemUIResCommon \ - TelecommResCommon \ - TelephonyResCommon \ - WifiResCommon \ + CarrierConfigResCommon_Sys \ + FrameworksResCommon_Sys \ + SettingsResCommon_Sys \ + SystemUIResCommon_Sys \ + TelecommResCommon_Sys \ + TelephonyResCommon_Sys \ + WifiResCommon_Sys PRODUCT_PACKAGES += \ FrameworksResTarget_Vendor \ diff --git a/overlay/CarrierConfigResCommon/Android.bp b/overlay/CarrierConfigResCommon_Sys/Android.bp similarity index 82% rename from overlay/CarrierConfigResCommon/Android.bp rename to overlay/CarrierConfigResCommon_Sys/Android.bp index 0a631a6..be8d643 100644 --- a/overlay/CarrierConfigResCommon/Android.bp +++ b/overlay/CarrierConfigResCommon_Sys/Android.bp @@ -5,7 +5,7 @@ // runtime_resource_overlay { - name: "CarrierConfigResCommon", + name: "CarrierConfigResCommon_Sys", product_specific: true, aaptflags: ["--keep-raw-values"], } diff --git a/overlay/CarrierConfigResCommon/AndroidManifest.xml b/overlay/CarrierConfigResCommon_Sys/AndroidManifest.xml similarity index 100% rename from overlay/CarrierConfigResCommon/AndroidManifest.xml rename to overlay/CarrierConfigResCommon_Sys/AndroidManifest.xml diff --git a/overlay/CarrierConfigResCommon/res/xml/vendor.xml b/overlay/CarrierConfigResCommon_Sys/res/xml/vendor.xml similarity index 100% rename from overlay/CarrierConfigResCommon/res/xml/vendor.xml rename to overlay/CarrierConfigResCommon_Sys/res/xml/vendor.xml diff --git a/overlay/FrameworksResCommon_Sys/Android.bp b/overlay/FrameworksResCommon_Sys/Android.bp new file mode 100644 index 0000000..e2491b8 --- /dev/null +++ b/overlay/FrameworksResCommon_Sys/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2024 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "FrameworksResCommon_Sys", + product_specific: true, +} diff --git a/overlay/FrameworksResCommon/AndroidManifest.xml b/overlay/FrameworksResCommon_Sys/AndroidManifest.xml similarity index 100% rename from overlay/FrameworksResCommon/AndroidManifest.xml rename to overlay/FrameworksResCommon_Sys/AndroidManifest.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rGB/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15-en-rGB/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rGB/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15-en-rGB/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rIN/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15-en-rIN/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc234-mnc15-en-rIN/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15-en-rIN/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rGB/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2-en-rGB/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rGB/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2-en-rGB/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rIN/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2-en-rIN/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc2-en-rIN/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2-en-rIN/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rGB/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4-en-rGB/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rGB/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4-en-rGB/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rIN/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4-en-rIN/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc4-en-rIN/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4-en-rIN/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rGB/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9-en-rGB/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rGB/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9-en-rGB/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rIN/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9-en-rIN/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc9-en-rIN/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9-en-rIN/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc120/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc120/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc260/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc260/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc4/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc4/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc410/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc410/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc311-mnc480/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc311-mnc480/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc454-mnc3/bools.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc3/bools.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc454-mnc3/bools.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc3/bools.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc454-mnc4/bools.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc4/bools.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc454-mnc4/bools.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc4/bools.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc455-mnc2/bools.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc2/bools.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc455-mnc2/bools.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc2/bools.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc455-mnc7/bools.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc7/bools.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc455-mnc7/bools.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc7/bools.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc460-mnc11/bools.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/bools.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc460-mnc11/bools.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/bools.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/config.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc460-mnc3/bools.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/bools.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc460-mnc3/bools.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/bools.xml diff --git a/overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml b/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml rename to overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/config.xml diff --git a/overlay/FrameworksResCommon/res/values/bools.xml b/overlay/FrameworksResCommon_Sys/res/values/bools.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values/bools.xml rename to overlay/FrameworksResCommon_Sys/res/values/bools.xml diff --git a/overlay/FrameworksResCommon/res/values/config.xml b/overlay/FrameworksResCommon_Sys/res/values/config.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values/config.xml rename to overlay/FrameworksResCommon_Sys/res/values/config.xml diff --git a/overlay/FrameworksResCommon/res/values/config_telephony.xml b/overlay/FrameworksResCommon_Sys/res/values/config_telephony.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values/config_telephony.xml rename to overlay/FrameworksResCommon_Sys/res/values/config_telephony.xml diff --git a/overlay/FrameworksResCommon/res/values/strings.xml b/overlay/FrameworksResCommon_Sys/res/values/strings.xml similarity index 100% rename from overlay/FrameworksResCommon/res/values/strings.xml rename to overlay/FrameworksResCommon_Sys/res/values/strings.xml diff --git a/overlay/FrameworksResCommon/Android.bp b/overlay/SettingsResCommon_Sys/Android.bp similarity index 81% rename from overlay/FrameworksResCommon/Android.bp rename to overlay/SettingsResCommon_Sys/Android.bp index fa9e81a..fb3a7fc 100644 --- a/overlay/FrameworksResCommon/Android.bp +++ b/overlay/SettingsResCommon_Sys/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "FrameworksResCommon", + name: "SettingsResCommon_Sys", product_specific: true, } diff --git a/overlay/SettingsResCommon/AndroidManifest.xml b/overlay/SettingsResCommon_Sys/AndroidManifest.xml similarity index 100% rename from overlay/SettingsResCommon/AndroidManifest.xml rename to overlay/SettingsResCommon_Sys/AndroidManifest.xml diff --git a/overlay/SettingsResCommon/res/values/config.xml b/overlay/SettingsResCommon_Sys/res/values/config.xml similarity index 100% rename from overlay/SettingsResCommon/res/values/config.xml rename to overlay/SettingsResCommon_Sys/res/values/config.xml diff --git a/overlay/SettingsResCommon/Android.bp b/overlay/SystemUIResCommon_Sys/Android.bp similarity index 81% rename from overlay/SettingsResCommon/Android.bp rename to overlay/SystemUIResCommon_Sys/Android.bp index 8142c67..2120988 100644 --- a/overlay/SettingsResCommon/Android.bp +++ b/overlay/SystemUIResCommon_Sys/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "SettingsResCommon", + name: "SystemUIResCommon_Sys", product_specific: true, } diff --git a/overlay/SystemUIResCommon/AndroidManifest.xml b/overlay/SystemUIResCommon_Sys/AndroidManifest.xml similarity index 100% rename from overlay/SystemUIResCommon/AndroidManifest.xml rename to overlay/SystemUIResCommon_Sys/AndroidManifest.xml diff --git a/overlay/SystemUIResCommon/res/values/config.xml b/overlay/SystemUIResCommon_Sys/res/values/config.xml similarity index 100% rename from overlay/SystemUIResCommon/res/values/config.xml rename to overlay/SystemUIResCommon_Sys/res/values/config.xml diff --git a/overlay/SystemUIResCommon/Android.bp b/overlay/TelecommResCommon_Sys/Android.bp similarity index 81% rename from overlay/SystemUIResCommon/Android.bp rename to overlay/TelecommResCommon_Sys/Android.bp index f16adeb..0d5ed49 100644 --- a/overlay/SystemUIResCommon/Android.bp +++ b/overlay/TelecommResCommon_Sys/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "SystemUIResCommon", + name: "TelecommResCommon_Sys", product_specific: true, } diff --git a/overlay/TelecommResCommon/AndroidManifest.xml b/overlay/TelecommResCommon_Sys/AndroidManifest.xml similarity index 100% rename from overlay/TelecommResCommon/AndroidManifest.xml rename to overlay/TelecommResCommon_Sys/AndroidManifest.xml diff --git a/overlay/TelecommResCommon/res/values/config.xml b/overlay/TelecommResCommon_Sys/res/values/config.xml similarity index 100% rename from overlay/TelecommResCommon/res/values/config.xml rename to overlay/TelecommResCommon_Sys/res/values/config.xml diff --git a/overlay/TelephonyResCommon/Android.bp b/overlay/TelephonyResCommon/Android.bp deleted file mode 100644 index 2f9c13f..0000000 --- a/overlay/TelephonyResCommon/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -// -// Copyright (C) 2024 The LineageOS Project -// -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "TelephonyResCommon", - product_specific: true, -} diff --git a/overlay/TelephonyResCommon_Sys/Android.bp b/overlay/TelephonyResCommon_Sys/Android.bp new file mode 100644 index 0000000..3e3bf40 --- /dev/null +++ b/overlay/TelephonyResCommon_Sys/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2024 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "TelephonyResCommon_Sys", + product_specific: true, +} diff --git a/overlay/TelephonyResCommon/AndroidManifest.xml b/overlay/TelephonyResCommon_Sys/AndroidManifest.xml similarity index 100% rename from overlay/TelephonyResCommon/AndroidManifest.xml rename to overlay/TelephonyResCommon_Sys/AndroidManifest.xml diff --git a/overlay/TelephonyResCommon/res/values/bools.xml b/overlay/TelephonyResCommon_Sys/res/values/bools.xml similarity index 100% rename from overlay/TelephonyResCommon/res/values/bools.xml rename to overlay/TelephonyResCommon_Sys/res/values/bools.xml diff --git a/overlay/TelephonyResCommon/res/values/config.xml b/overlay/TelephonyResCommon_Sys/res/values/config.xml similarity index 100% rename from overlay/TelephonyResCommon/res/values/config.xml rename to overlay/TelephonyResCommon_Sys/res/values/config.xml diff --git a/overlay/WifiResCommon/Android.bp b/overlay/WifiResCommon/Android.bp deleted file mode 100644 index 740d98d..0000000 --- a/overlay/WifiResCommon/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -// -// Copyright (C) 2024 The LineageOS Project -// -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "WifiResCommon", - product_specific: true, -} diff --git a/overlay/TelecommResCommon/Android.bp b/overlay/WifiResCommon_Sys/Android.bp similarity index 82% rename from overlay/TelecommResCommon/Android.bp rename to overlay/WifiResCommon_Sys/Android.bp index baf1842..15bc0b6 100644 --- a/overlay/TelecommResCommon/Android.bp +++ b/overlay/WifiResCommon_Sys/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "TelecommResCommon", + name: "WifiResCommon_Sys", product_specific: true, } diff --git a/overlay/WifiResCommon/AndroidManifest.xml b/overlay/WifiResCommon_Sys/AndroidManifest.xml similarity index 100% rename from overlay/WifiResCommon/AndroidManifest.xml rename to overlay/WifiResCommon_Sys/AndroidManifest.xml diff --git a/overlay/WifiResCommon/res/values/bools.xml b/overlay/WifiResCommon_Sys/res/values/bools.xml similarity index 100% rename from overlay/WifiResCommon/res/values/bools.xml rename to overlay/WifiResCommon_Sys/res/values/bools.xml diff --git a/overlay/WifiResCommon/res/values/config.xml b/overlay/WifiResCommon_Sys/res/values/config.xml similarity index 100% rename from overlay/WifiResCommon/res/values/config.xml rename to overlay/WifiResCommon_Sys/res/values/config.xml