From d37d52c590a2a45c01daf290d4d24180af77217e Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Sun, 20 Jun 2021 19:30:07 +0200 Subject: [PATCH] d2x: adapt from beyondx Change-Id: Ic27971aaf8e9f62870ef9a1f3d374157bfd229a8 --- Android.mk | 2 +- AndroidProducts.mk | 8 +- BoardConfig.mk | 6 +- device.mk | 2 +- extract-files.sh | 2 +- lineage_beyondx.mk => lineage_d2x.mk | 10 +- .../base/core/res/res/values/config.xml | 2 +- .../base/core/res/res/values/dimens.xml | 2 +- .../base/core/res/res/xml/power_profile.xml | 184 ++++++++---------- proprietary-files.txt | 8 +- setup-makefiles.sh | 2 +- 11 files changed, 98 insertions(+), 130 deletions(-) rename lineage_beyondx.mk => lineage_d2x.mk (89%) diff --git a/Android.mk b/Android.mk index ba9cd75..f0e76ff 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter beyondx, $(TARGET_DEVICE)),) +ifneq ($(filter d2x, $(TARGET_DEVICE)),) include $(call all-subdir-makefiles,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 0c53077..503027f 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_beyondx.mk + $(LOCAL_DIR)/lineage_d2x.mk COMMON_LUNCH_CHOICES := \ - lineage_beyondx-eng \ - lineage_beyondx-user \ - lineage_beyondx-userdebug + lineage_d2x-eng \ + lineage_d2x-user \ + lineage_d2x-userdebug diff --git a/BoardConfig.mk b/BoardConfig.mk index 63dd6df..d2ec627 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -17,9 +17,9 @@ include device/samsung/exynos9820-common/BoardConfigCommon.mk ## Inherit from the proprietary configuration -include vendor/samsung/beyondx/BoardConfigVendor.mk +include vendor/samsung/d2x/BoardConfigVendor.mk -DEVICE_PATH := device/samsung/beyondx +DEVICE_PATH := device/samsung/d2x ## APEX image DEXPREOPT_GENERATE_APEX_IMAGE := true @@ -30,7 +30,7 @@ TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_PATH)/include TARGET_SCREEN_DENSITY := 420 ## Kernel -TARGET_KERNEL_CONFIG := exynos9820-beyondx_defconfig +TARGET_KERNEL_CONFIG := exynos9820-d2x_defconfig ## Properties TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop diff --git a/device.mk b/device.mk index 73f1423..dc61d26 100644 --- a/device.mk +++ b/device.mk @@ -18,7 +18,7 @@ $(call inherit-product, device/samsung/exynos9820-common/common.mk) # Inherit proprietary files -$(call inherit-product, vendor/samsung/beyondx/beyondx-vendor.mk) +$(call inherit-product, vendor/samsung/d2x/d2x-vendor.mk) # Setup dalvik vm configs $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) diff --git a/extract-files.sh b/extract-files.sh index 75c36ad..295cf94 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -14,7 +14,7 @@ fi set -e -export DEVICE=beyondx +export DEVICE=d2x export DEVICE_COMMON=exynos9820-common export VENDOR=samsung diff --git a/lineage_beyondx.mk b/lineage_d2x.mk similarity index 89% rename from lineage_beyondx.mk rename to lineage_d2x.mk index 60b1ad5..db07694 100644 --- a/lineage_beyondx.mk +++ b/lineage_d2x.mk @@ -24,8 +24,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk) ## Inscreen Fingerprint HAL TARGET_HAVE_FOD := true -## Inherit from beyondx device -$(call inherit-product, device/samsung/beyondx/device.mk) +## Inherit from d2x device +$(call inherit-product, device/samsung/d2x/device.mk) ## Boot Animation TARGET_BOOTANIMATION_HALF_RES := true @@ -39,10 +39,10 @@ $(call inherit-product, vendor/lineage/config/common_full_phone.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) ## Device identifier, this must come after all inclusions -PRODUCT_NAME := lineage_beyondx -PRODUCT_DEVICE := beyondx +PRODUCT_NAME := lineage_d2x +PRODUCT_DEVICE := d2x PRODUCT_BRAND := samsung -PRODUCT_MODEL := SM-G977B +PRODUCT_MODEL := SM-N976B PRODUCT_MANUFACTURER := samsung PRODUCT_GMS_CLIENTID_BASE := android-samsung diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 3683d66..fc6debe 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -41,5 +41,5 @@ @see https://www.w3.org/TR/SVG/paths.html#PathData --> - M 0,0 H -427 V 139 H 0 V 0 Z @right + M 0,0 H -33 V 84 H 33 V 0 H 0 Z diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml index c6074a4..902e7a9 100644 --- a/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -19,5 +19,5 @@ --> - 7mm + 5.76297mm diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 91ac449..0e665c4 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -1,19 +1,19 @@ 0 - 21 - 72 - 339 - 35 - 176 - 107 - 417 - 31 - 171 - 114 + 21.9 + 68.5 + 356.5 + 74 + 209 + 150 + 277 + 53 + 169 + 109 - 7.7 - 7.7 + 10 + 10 0 0 @@ -40,21 +40,22 @@ 442000 - 109 - 99 - 90 - 71 - 62 - 57 - 49 - 46 + 111 + 102 + 91 + 77 + 69 + 63 + 58 + 54 + 51 + 48 + 45 43 - 39 - 35 - 34 - 32 + 42 + 2400000 2314000 2210000 2106000 @@ -74,23 +75,24 @@ 507000 - 382 - 285 - 250 - 223 - 199 - 178 - 156 + 415 + 367 + 283 + 241 + 216 + 196 + 176 + 155 139 - 130 - 117 - 100 - 86 + 129 + 119 + 104 + 91 + 84 77 - 70 - 64 - 57 - 51 + 72 + 66 + 59 2730000 @@ -116,32 +118,32 @@ 520000 - 1301 - 1208 - 1028 - 837 - 679 - 610 - 485 - 425 - 353 - 307 - 270 - 241 - 224 - 193 - 178 - 153 - 133 - 115 - 105 - 94 - 83 + 1067 + 1001 + 835 + 752 + 621 + 561 + 443 + 387 + 328 + 288 + 254 + 229 + 213 + 189 + 174 + 155 + 132 + 118 + 112 + 101 + 92 - 4.99 - 20 - 4000 - 4100 + 7.2 + 27 + 4170 + 4300 1 65 265 @@ -160,15 +162,15 @@ 10 10 - 78 - 105 - 128 - 160 - 230 - 266 - 389 - 458 - 516 + 73 + 95 + 115 + 138 + 205 + 235 + 333 + 408 + 515 156000 @@ -179,40 +181,6 @@ 433000 572000 650000 - 702000 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 754000 \ No newline at end of file diff --git a/proprietary-files.txt b/proprietary-files.txt index a26b6fd..ae05014 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# Proprietary files - from Samsung package version G977BXXS8FUE5, unless pinned +# Proprietary files - from Samsung package version N976BXXS7FUEA, unless pinned ## Audio vendor/etc/floating_feature.xml @@ -19,8 +19,8 @@ vendor/firmware/bcm4375B1_semco.hcd vendor/firmware/bcm4375B1_semco_sem.hcd ## Camera -vendor/lib/hw/camera.exynos9820.so -vendor/lib64/hw/camera.exynos9820.so +vendor/lib/hw/camera.exynos9825.so +vendor/lib64/hw/camera.exynos9825.so ## Camera dependencies vendor/lib/libexynoscamera3.so @@ -39,7 +39,7 @@ vendor/firmware/cs35l40-rcv-dsp1-spk-prot-calib.bin vendor/firmware/cs35l40-rcv-dsp1-spk-prot.bin vendor/firmware/fimc_is_fw_mcu.bin vendor/firmware/setfile_2l4.bin -vendor/firmware/setfile_3m3.bin +vendor/firmware/setfile_3m5.bin vendor/firmware/setfile_3p9.bin ## GPS diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 75c36ad..295cf94 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -14,7 +14,7 @@ fi set -e -export DEVICE=beyondx +export DEVICE=d2x export DEVICE_COMMON=exynos9820-common export VENDOR=samsung