dubai: Debrand manifests & overlays

This makes it easier to compare devices and/or convert device trees. Change-Id: I74edc128a9c825cbc3189a6c1594ac5b19bae591
2025-01-21 08:21:48 +02:00 · 2025-01-21 08:21:48 +02:00 · 65585bf2bf
commit 65585bf2bf
parent 0e3357e8e6
26 changed files with 2 additions and 2 deletions
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@ -17,8 +17,8 @@ TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.dubai
 SOONG_CONFIG_qtidisplay_udfps := true

 # HIDL
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_dubai.xml
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_dubai.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix.xml
+DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml

 # Kernel
 BOARD_KERNEL_CMDLINE += androidboot.hab.product=dubai
--- a/device_framework_matrix_dubai.xml
+++ b/device_framework_matrix_dubai.xml
--- a/manifest_dubai.xml
+++ b/manifest_dubai.xml
--- a/resource-overlay/device/Frameworks/Android.bp
+++ b/resource-overlay/device/Frameworks/Android.bp
--- a/resource-overlay/device/Frameworks/AndroidManifest.xml
+++ b/resource-overlay/device/Frameworks/AndroidManifest.xml
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
--- a/resource-overlay/device/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/device/Frameworks/res/values/dimens.xml
--- a/resource-overlay/device/Frameworks/res/xml/power_profile.xml
+++ b/resource-overlay/device/Frameworks/res/xml/power_profile.xml
--- a/resource-overlay/device/LineageSystemUI/Android.bp
+++ b/resource-overlay/device/LineageSystemUI/Android.bp
--- a/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
+++ b/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
--- a/resource-overlay/device/LineageSystemUI/res/values/config.xml
+++ b/resource-overlay/device/LineageSystemUI/res/values/config.xml
--- a/resource-overlay/device/Settings/Android.bp
+++ b/resource-overlay/device/Settings/Android.bp
--- a/resource-overlay/device/Settings/AndroidManifest.xml
+++ b/resource-overlay/device/Settings/AndroidManifest.xml
--- a/resource-overlay/device/Settings/res/drawable/regulatory_info.png
+++ b/resource-overlay/device/Settings/res/drawable/regulatory_info.png
--- a/resource-overlay/device/Settings/res/values/config.xml
+++ b/resource-overlay/device/Settings/res/values/config.xml
--- a/resource-overlay/device/SettingsProvider/Android.bp
+++ b/resource-overlay/device/SettingsProvider/Android.bp
--- a/resource-overlay/device/SettingsProvider/AndroidManifest.xml
+++ b/resource-overlay/device/SettingsProvider/AndroidManifest.xml
--- a/resource-overlay/device/SettingsProvider/res/values/config.xml
+++ b/resource-overlay/device/SettingsProvider/res/values/config.xml
--- a/resource-overlay/device/SystemUI/Android.bp
+++ b/resource-overlay/device/SystemUI/Android.bp
--- a/resource-overlay/device/SystemUI/AndroidManifest.xml
+++ b/resource-overlay/device/SystemUI/AndroidManifest.xml
--- a/resource-overlay/device/SystemUI/res/values/config.xml
+++ b/resource-overlay/device/SystemUI/res/values/config.xml
--- a/resource-overlay/device/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/device/SystemUI/res/values/dimens.xml
--- a/resource-overlay/device/SystemUI/res/values/integers.xml
+++ b/resource-overlay/device/SystemUI/res/values/integers.xml
--- a/resource-overlay/device/Wifi/Android.bp
+++ b/resource-overlay/device/Wifi/Android.bp
--- a/resource-overlay/device/Wifi/AndroidManifest.xml
+++ b/resource-overlay/device/Wifi/AndroidManifest.xml
--- a/resource-overlay/device/Wifi/res/values/config.xml
+++ b/resource-overlay/device/Wifi/res/values/config.xml