oscaro: Initial device tree conversion from larry

Change-Id: I8895a1df55441d9c97e183fd342e6ec5230df136

Android.mk

@@ -6,7 +6,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),larry)
+ifeq ($(TARGET_DEVICE),oscaro)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 

AndroidProducts.mk

@@ -5,5 +5,5 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_larry.mk
+    $(LOCAL_DIR)/lineage_oscaro.mk
 

BoardConfig.mk

@@ -7,11 +7,11 @@
 # Inherit from sm6375-common
 -include device/oneplus/sm6375-common/BoardConfigCommon.mk
 
-DEVICE_PATH := device/oneplus/larry
+DEVICE_PATH := device/oneplus/oscaro
 
 # Partitions
 BOARD_ONEPLUS_DYNAMIC_PARTITIONS_SIZE := 12880707584
 BOARD_SUPER_PARTITION_SIZE := 12884901888
 
 # Inherit the proprietary files
--include vendor/oneplus/larry/BoardConfigVendor.mk
+-include vendor/oneplus/oscaro/BoardConfigVendor.mk

board-info.txt

@@ -1 +1 @@
-require board=holi|OP5958L1
+require board=holi|OP535DL1

device.mk

@@ -37,4 +37,4 @@ PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
 # Inherit proprietary files
-$(call inherit-product-if-exists, vendor/oneplus/larry/larry-vendor.mk)
+$(call inherit-product-if-exists, vendor/oneplus/oscaro/oscaro-vendor.mk)

extract-files.py

@@ -36,7 +36,7 @@
 }  # fmt: skip
 
 module = ExtractUtilsModule(
-    'larry',
+    'oscaro',
     'oneplus',
     namespace_imports=namespace_imports,
     blob_fixups=blob_fixups,

lineage_larry.mk → lineage_oscaro.mk

@@ -11,22 +11,22 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit some common LineageOS stuff
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-# Inherit from larry device
+# Inherit from oscaro device
 $(call inherit-product, $(LOCAL_PATH)/device.mk)
 
 # Device identifier. This must come after all inclusions.
-PRODUCT_NAME := lineage_larry
-PRODUCT_DEVICE := larry
+PRODUCT_NAME := lineage_oscaro
+PRODUCT_DEVICE := oscaro
 PRODUCT_BRAND := oneplus
-PRODUCT_MODEL := CPH2467
+PRODUCT_MODEL := CPH2381
 PRODUCT_MANUFACTURER := oneplus
 
 PRODUCT_GMS_CLIENTID_BASE := android-oppo
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="OP5958L1-user 14 UKQ1.230924.001 T.R4T2.18a850a_1c802_26b84 release-keys" \
-    BuildFingerprint=OnePlus/CPH2467/OP5958L1:14/UKQ1.230924.001/T.R4T2.18a850a_1c802_26b84:user/release-keys \
-    DeviceName=OP5958L1 \
-    DeviceProduct=OP5958L1 \
-    SystemDevice=OP5958L1 \
-    SystemName=OP5958L1
+    BuildDesc="OP535DL1-user 14 UKQ1.230924.001 S.19e5610_4129-4b32d release-keys" \
+    BuildFingerprint=OnePlus/CPH2381/OP535DL1:14/UKQ1.230924.001/S.19e5610_4129-4b32d:user/release-keys \
+    DeviceName=OP535DL1 \
+    DeviceProduct=OP535DL1 \
+    SystemDevice=OP535DL1 \
+    SystemName=OP535DL1

overlay/OPlusFrameworksResTarget/res/values/config.xml

@@ -339,11 +339,12 @@
          Note that a physical cutout should be configured in pixels for the best results.
          -->
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        M 0,62
-        M -34,62
-        A 34,34 0 1,0 34,62
-        A 34,34 0 1,0 -34,62
+        M 99,68.5
+        M 65,68.5
+        A 34,34 0 1,0 133,68.5
+        A 34,34 0 1,0 65,68.5
         Z
+        @left
     </string>
 
     <!-- Like config_mainBuiltInDisplayCutout, but this path is used to report the
@@ -353,11 +354,12 @@
          config_mainBuiltInDisplayCutout
          -->
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        M -50,0
-        H 50
-        V 100
-        H -50
+        M 0,0
+        H 164
+        V 123
+        H 0
         Z
+        @left
     </string>
 
     <!-- Whether the display cutout region of the main built-in display should be forced to