dubai: Rebrand to bangkk

Change-Id: Ie4b9250a351cf20009372e9b9bb4cc9f90891efe
2024-06-28 16:22:28 +03:00 · 2024-06-28 16:22:28 +03:00 · 1f0ab69acd
commit 1f0ab69acd
parent 915abacb0a
27 changed files with 59 additions and 59 deletions
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@ -4,4 +4,4 @@
 #

 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_dubai.mk
+    $(LOCAL_DIR)/lineage_bangkk.mk
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@ -3,16 +3,16 @@
 # SPDX-License-Identifier: Apache-2.0
 #

-DEVICE_PATH := device/motorola/dubai
+DEVICE_PATH := device/motorola/bangkk

-# Inherit from motorola sm7325-common
-include device/motorola/sm7325-common/BoardConfigCommon.mk
+# Inherit from motorola sm6375-common
+include device/motorola/sm6375-common/BoardConfigCommon.mk

 # Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := dubai
+TARGET_BOOTLOADER_BOARD_NAME := bangkk

 # Fingerprint
-TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.dubai
+TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.bangkk
 SOONG_CONFIG_qtidisplay_udfps := true

 # HIDL
@ -20,8 +20,8 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_ma
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml

 # Kernel
-BOARD_KERNEL_CMDLINE += androidboot.hab.product=dubai
-TARGET_KERNEL_CONFIG += vendor/lineage_dubai.config
+BOARD_KERNEL_CMDLINE += androidboot.hab.product=bangkk
+TARGET_KERNEL_CONFIG += vendor/lineage_bangkk.config

 # Kernel Modules
 BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load))
@ -49,4 +49,4 @@ BOARD_AVB_ROLLBACK_INDEX := 29
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 29

 # inherit from the proprietary version
-include vendor/motorola/dubai/BoardConfigVendor.mk
+include vendor/motorola/bangkk/BoardConfigVendor.mk
--- a/README.md
+++ b/README.md
@ -1,3 +1,3 @@
-Device tree for the Motorola edge 30
+Device tree for the Motorola moto g84

-Information about the device, build and install instructions can be found [here](http://wiki.lineageos.org/devices/dubai/)
+Information about the device, build and install instructions can be found [here](http://wiki.lineageos.org/devices/bangkk/)
--- a/device.mk
+++ b/device.mk
@ -20,16 +20,16 @@ PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi

 PRODUCT_SHIPPING_API_LEVEL := 31

-# Inherit from motorola sm7325-common
-$(call inherit-product, device/motorola/sm7325-common/common.mk)
+# Inherit from motorola sm6375-common
+$(call inherit-product, device/motorola/sm6375-common/common.mk)

-# Overlay
+# Overlays
 PRODUCT_PACKAGES += \
-    FrameworksResDubai \
-    LineageSystemUIDubai \
-    SettingsResDubai \
-    SystemUIResDubai \
-    WifiResDubai
+    FrameworksResBangkk \
+    LineageSystemUIBangkk \
+    SettingsResBangkk \
+    SystemUIResBangkk \
+    WifiResBangkk

 # Audio
 PRODUCT_COPY_FILES += \
@ -47,7 +47,7 @@ PRODUCT_PACKAGES += \

 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.3-service.dubai
+    android.hardware.biometrics.fingerprint@2.3-service.bangkk

 # GMS
 ifeq ($(WITH_GMS),true)
@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \

 # Sensors
 PRODUCT_PACKAGES += \
-    sensors.dubai
+    sensors.bangkk

 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
@ -89,7 +89,7 @@ PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)

 # Thermal
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/thermal-engine-dubai-game-perf.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-dubai.conf
+    $(LOCAL_PATH)/configs/thermal-engine-bangkk-game-perf.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-bangkk.conf

 # Inherit from vendor blobs
-$(call inherit-product, vendor/motorola/dubai/dubai-vendor.mk)
+$(call inherit-product, vendor/motorola/bangkk/bangkk-vendor.mk)
--- a/extract-files.py
+++ b/extract-files.py
@ -20,7 +20,7 @@ from extract_utils.main import (
 )

 namespace_imports = [
-    'vendor/motorola/sm7325-common',
+    'vendor/motorola/sm6375-common',
    'hardware/motorola',
    'hardware/qcom-caf/sm8350',
    'hardware/qcom-caf/wlan',
@ -48,7 +48,7 @@ extract_fns: extract_fns_user_type = {
 }

 module = ExtractUtilsModule(
-    'dubai',
+    'bangkk',
    'motorola',
    blob_fixups=blob_fixups,
    lib_fixups=lib_fixups,
@ -60,6 +60,6 @@ module = ExtractUtilsModule(

 if __name__ == '__main__':
    utils = ExtractUtils.device_with_common(
-        module, 'sm7325-common', module.vendor
+        module, 'sm6375-common', module.vendor
    )
    utils.run()
--- a/fingerprint/Android.bp
+++ b/fingerprint/Android.bp
@ -1,8 +1,8 @@
 cc_binary {
-    name: "android.hardware.biometrics.fingerprint@2.3-service.dubai",
+    name: "android.hardware.biometrics.fingerprint@2.3-service.bangkk",
    defaults: ["hidl_defaults"],
-    init_rc: ["android.hardware.biometrics.fingerprint@2.3-service.dubai.rc"],
-    vintf_fragments: ["android.hardware.biometrics.fingerprint@2.3-service.dubai.xml"],
+    init_rc: ["android.hardware.biometrics.fingerprint@2.3-service.bangkk.rc"],
+    vintf_fragments: ["android.hardware.biometrics.fingerprint@2.3-service.bangkk.xml"],
    relative_install_path: "hw",
    srcs: [
        "service.cpp",
@ -22,7 +22,7 @@ cc_binary {
 }

 cc_library_static {
-    name: "libudfps_extension.dubai",
+    name: "libudfps_extension.bangkk",
    srcs: ["UdfpsExtension.cpp"],
    include_dirs: [
        "frameworks/native/services/surfaceflinger/CompositionEngine/include"
--- a/fingerprint/BiometricsFingerprint.cpp
+++ b/fingerprint/BiometricsFingerprint.cpp
@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.dubai"
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.bangkk"

 #include "BiometricsFingerprint.h"

--- a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.bangkk.rc
+++ b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.bangkk.rc
@ -1,4 +1,4 @@
-service vendor.fps_hal.dubai /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.dubai
+service vendor.fps_hal.bangkk /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.bangkk
    # "class hal" causes a race condition on some devices due to files created
    # in /data. As a workaround, postpone startup until later in boot once
    # /data is mounted.
--- a/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.bangkk.xml
+++ b/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.bangkk.xml
--- a/fingerprint/service.cpp
+++ b/fingerprint/service.cpp
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.dubai"
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.bangkk"
 #include <android-base/logging.h>
 #include <hidl/HidlTransportSupport.h>
 #include "BiometricsFingerprint.h"
--- a/lineage.dependencies
+++ b/lineage.dependencies
@ -1,6 +1,6 @@
 [
  {
-    "repository": "android_device_motorola_sm7325-common",
-    "target_path": "device/motorola/sm7325-common"
+    "repository": "android_device_motorola_sm6375-common",
+    "target_path": "device/motorola/sm6375-common"
  }
 ]
--- a/lineage_bangkk.mk
+++ b/lineage_bangkk.mk
@ -8,21 +8,21 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 TARGET_SUPPORTS_OMX_SERVICE := false
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)

-# Inherit from dubai device
-$(call inherit-product, device/motorola/dubai/device.mk)
+# Inherit from bangkk device
+$(call inherit-product, device/motorola/bangkk/device.mk)

 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)

-PRODUCT_NAME := lineage_dubai
-PRODUCT_DEVICE := dubai
+PRODUCT_NAME := lineage_bangkk
+PRODUCT_DEVICE := bangkk
 PRODUCT_MANUFACTURER := motorola
 PRODUCT_BRAND := motorola
-PRODUCT_MODEL := motorola edge 30
+PRODUCT_MODEL := moto g84 5G

 PRODUCT_GMS_CLIENTID_BASE := android-motorola

 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="dubai_g-user 14 U1RDS34.80-40-5-3 b1f71-ff67e release-keys" \
-    BuildFingerprint=motorola/dubai_g/dubai:14/U1RDS34.80-40-5-3/b1f71-ff67e:user/release-keys \
-    DeviceProduct=dubai_g
+    BuildDesc="bangkk_g-user 14 U1TCS34.22-64-19-4-3 eae476-b2a7b2 release-keys MUR1-0.90" \
+    BuildFingerprint=motorola/bangkk_g/bangkk:14/U1TCS34.22-64-19-4-3/eae476-b2a7b2:user/release-keys \
+    DeviceProduct=bangkk_g
--- a/product.prop
+++ b/product.prop
@ -1,5 +1,5 @@
 # Google
-ro.opa.device_model_id=motorola-dubai
+ro.opa.device_model_id=motorola-bangkk

 # Motorola
 ro.mot.build.customerid=global
--- a/resource-overlay/device/Frameworks/Android.bp
+++ b/resource-overlay/device/Frameworks/Android.bp
@ -4,6 +4,6 @@
 //

 runtime_resource_overlay {
-    name: "FrameworksResDubai",
+    name: "FrameworksResBangkk",
    vendor: true,
 }
--- a/resource-overlay/device/Frameworks/AndroidManifest.xml
+++ b/resource-overlay/device/Frameworks/AndroidManifest.xml
@ -4,7 +4,7 @@
     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.overlay.dubai">
+    package="android.overlay.bangkk">

    <overlay
        android:isStatic="true"
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
@ -141,7 +141,7 @@
    </integer-array>

    <!-- MMS user agent string -->
-    <string name="config_mms_user_agent" translatable="false">motorolaedge30</string>
+    <string name="config_mms_user_agent" translatable="false">motog845g</string>

    <!-- MMS user agent prolfile url -->
    <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf</string>
--- a/resource-overlay/device/LineageSystemUI/Android.bp
+++ b/resource-overlay/device/LineageSystemUI/Android.bp
@ -4,6 +4,6 @@
 //

 runtime_resource_overlay {
-    name: "LineageSystemUIDubai",
+    name: "LineageSystemUIBangkk",
    vendor: true,
 }
--- a/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
+++ b/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
@ -4,7 +4,7 @@
     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.dubai.lineage">
+    package="com.android.systemui.bangkk.lineage">

    <overlay
        android:isStatic="true"
--- a/resource-overlay/device/Settings/Android.bp
+++ b/resource-overlay/device/Settings/Android.bp
@ -4,6 +4,6 @@
 //

 runtime_resource_overlay {
-    name: "SettingsResDubai",
+    name: "SettingsResBangkk",
    vendor: true,
 }
--- a/resource-overlay/device/Settings/AndroidManifest.xml
+++ b/resource-overlay/device/Settings/AndroidManifest.xml
@ -4,7 +4,7 @@
     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay.dubai">
+    package="com.android.settings.overlay.bangkk">

    <overlay
        android:isStatic="true"
--- a/resource-overlay/device/SystemUI/Android.bp
+++ b/resource-overlay/device/SystemUI/Android.bp
@ -4,6 +4,6 @@
 //

 runtime_resource_overlay {
-    name: "SystemUIResDubai",
+    name: "SystemUIResBangkk",
    vendor: true,
 }
--- a/resource-overlay/device/SystemUI/AndroidManifest.xml
+++ b/resource-overlay/device/SystemUI/AndroidManifest.xml
@ -4,7 +4,7 @@
     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.overlay.dubai">
+    package="com.android.systemui.overlay.bangkk">

    <overlay
        android:isStatic="true"
--- a/resource-overlay/device/Wifi/Android.bp
+++ b/resource-overlay/device/Wifi/Android.bp
@ -4,6 +4,6 @@
 //

 runtime_resource_overlay {
-    name: "WifiResDubai",
+    name: "WifiResBangkk",
    vendor: true,
 }
--- a/resource-overlay/device/Wifi/AndroidManifest.xml
+++ b/resource-overlay/device/Wifi/AndroidManifest.xml
@ -4,7 +4,7 @@
     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.wifi.resources.overlay.dubai">
+    package="com.android.wifi.resources.overlay.bangkk">

    <overlay
        android:isStatic="true"
--- a/resource-overlay/device/Wifi/res/values/config.xml
+++ b/resource-overlay/device/Wifi/res/values/config.xml
@ -5,5 +5,5 @@
 -->
 <resources>
    <!-- Do not translate. Default access point SSID used for tethering -->
-    <string name="wifi_tether_configure_ssid_default" translatable="false">motorola edge 30</string>
+    <string name="wifi_tether_configure_ssid_default" translatable="false">moto g84 5G</string>
 </resources>
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@ -4,7 +4,7 @@
 //

 cc_library_shared {
-    name: "sensors.dubai",
+    name: "sensors.bangkk",
    defaults: ["hidl_defaults"],
    srcs: [
        "Sensor.cpp",
@ -28,7 +28,7 @@ cc_library_shared {
        "android.hardware.sensors@2.X-multihal",
    ],
    cflags: [
-        "-DLOG_TAG=\"sensors.dubai\"",
+        "-DLOG_TAG=\"sensors.bangkk\"",
    ],
    vendor: true,
 }
--- a/sensors/hals.conf
+++ b/sensors/hals.conf
@ -1,3 +1,3 @@
 sensors.ssc.so
 sensors.moto.so
-sensors.dubai.so
+sensors.bangkk.so