d1: adapt from beyond2lte

Change-Id: Icea5244d405a711671268f9bd240f56941a8941f
This commit is contained in:
Tim Zimmermann
2021-06-20 18:58:30 +02:00
parent 9adbf80570
commit b75c69d289
11 changed files with 100 additions and 134 deletions

View File

@@ -16,6 +16,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(filter beyond2lte, $(TARGET_DEVICE)),) ifneq ($(filter d1, $(TARGET_DEVICE)),)
include $(call all-subdir-makefiles,$(LOCAL_PATH)) include $(call all-subdir-makefiles,$(LOCAL_PATH))
endif endif

View File

@@ -15,9 +15,9 @@
# #
PRODUCT_MAKEFILES := \ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_beyond2lte.mk $(LOCAL_DIR)/lineage_d1.mk
COMMON_LUNCH_CHOICES := \ COMMON_LUNCH_CHOICES := \
lineage_beyond2lte-eng \ lineage_d1-eng \
lineage_beyond2lte-user \ lineage_d1-user \
lineage_beyond2lte-userdebug lineage_d1-userdebug

View File

@@ -17,9 +17,9 @@
include device/samsung/exynos9820-common/BoardConfigCommon.mk include device/samsung/exynos9820-common/BoardConfigCommon.mk
## Inherit from the proprietary configuration ## Inherit from the proprietary configuration
include vendor/samsung/beyond2lte/BoardConfigVendor.mk include vendor/samsung/d1/BoardConfigVendor.mk
DEVICE_PATH := device/samsung/beyond2lte DEVICE_PATH := device/samsung/d1
## APEX image ## APEX image
DEXPREOPT_GENERATE_APEX_IMAGE := true DEXPREOPT_GENERATE_APEX_IMAGE := true
@@ -30,7 +30,7 @@ TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_PATH)/include
TARGET_SCREEN_DENSITY := 420 TARGET_SCREEN_DENSITY := 420
## Kernel ## Kernel
TARGET_KERNEL_CONFIG := exynos9820-beyond2lte_defconfig TARGET_KERNEL_CONFIG := exynos9820-d1_defconfig
## Properties ## Properties
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop

View File

@@ -18,7 +18,7 @@
$(call inherit-product, device/samsung/exynos9820-common/common.mk) $(call inherit-product, device/samsung/exynos9820-common/common.mk)
# Inherit proprietary files # Inherit proprietary files
$(call inherit-product, vendor/samsung/beyond2lte/beyond2lte-vendor.mk) $(call inherit-product, vendor/samsung/d1/d1-vendor.mk)
# Setup dalvik vm configs # Setup dalvik vm configs
$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)

View File

@@ -14,7 +14,7 @@ fi
set -e set -e
export DEVICE=beyond2lte export DEVICE=d1
export DEVICE_COMMON=exynos9820-common export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung export VENDOR=samsung

View File

@@ -24,13 +24,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)
## Inscreen Fingerprint HAL ## Inscreen Fingerprint HAL
TARGET_HAVE_FOD := true TARGET_HAVE_FOD := true
## Inherit from beyond2lte device ## Inherit from d1 device
$(call inherit-product, device/samsung/beyond2lte/device.mk) $(call inherit-product, device/samsung/d1/device.mk)
## Boot Animation ## Boot Animation
TARGET_BOOTANIMATION_HALF_RES := true TARGET_BOOTANIMATION_HALF_RES := true
TARGET_SCREEN_HEIGHT := 3040 TARGET_SCREEN_HEIGHT := 2280
TARGET_SCREEN_WIDTH := 1440 TARGET_SCREEN_WIDTH := 1080
## Inherit some common Lineage stuff ## Inherit some common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_full_phone.mk) $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
@@ -39,10 +39,10 @@ $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
## Device identifier, this must come after all inclusions ## Device identifier, this must come after all inclusions
PRODUCT_NAME := lineage_beyond2lte PRODUCT_NAME := lineage_d1
PRODUCT_DEVICE := beyond2lte PRODUCT_DEVICE := d1
PRODUCT_BRAND := samsung PRODUCT_BRAND := samsung
PRODUCT_MODEL := SM-G975F PRODUCT_MODEL := SM-N970F
PRODUCT_MANUFACTURER := samsung PRODUCT_MANUFACTURER := samsung
PRODUCT_GMS_CLIENTID_BASE := android-samsung PRODUCT_GMS_CLIENTID_BASE := android-samsung

View File

@@ -41,5 +41,5 @@
@see https://www.w3.org/TR/SVG/paths.html#PathData @see https://www.w3.org/TR/SVG/paths.html#PathData
--> -->
<string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -326 V 142 H 0 V 0 Z @right</string> <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -36 V 90 H 36 V 0 H 0 Z</string>
</resources> </resources>

View File

@@ -19,5 +19,5 @@
--> -->
<resources> <resources>
<!-- Height of the status bar in portrait --> <!-- Height of the status bar in portrait -->
<dimen name="status_bar_height_portrait">7mm</dimen> <dimen name="status_bar_height_portrait">5.6879883mm</dimen>
</resources> </resources>

View File

@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<device name="Android"> <device name="Android">
<item name="none">0</item> <item name="none">0</item>
<item name="ambient.on">21</item> <item name="ambient.on">21.8</item>
<item name="screen.on">72</item> <item name="screen.on">58</item>
<item name="screen.full">339</item> <item name="screen.full">293.5</item>
<item name="audio">35</item> <item name="audio">74</item>
<item name="video">176</item> <item name="video">195</item>
<item name="camera.flashlight">107</item> <item name="camera.flashlight">150</item>
<item name="camera.avg">417</item> <item name="camera.avg">243</item>
<item name="gps.on">31</item> <item name="gps.on">53</item>
<item name="radio.active">171</item> <item name="radio.active">169</item>
<item name="radio.scanning">114</item> <item name="radio.scanning">109</item>
<array name="radio.on"> <array name="radio.on">
<value>7.7</value> <value>10</value>
<value>7.7</value> <value>10</value>
</array> </array>
<item name="modem.controller.idle">0</item> <item name="modem.controller.idle">0</item>
<item name="modem.controller.rx">0</item> <item name="modem.controller.rx">0</item>
@@ -40,21 +40,22 @@
<value>442000</value> <value>442000</value>
</array> </array>
<array name="cpu.core_power.cluster0"> <array name="cpu.core_power.cluster0">
<value>109</value> <value>111</value>
<value>99</value> <value>102</value>
<value>90</value> <value>91</value>
<value>71</value> <value>77</value>
<value>62</value> <value>69</value>
<value>57</value> <value>63</value>
<value>49</value> <value>58</value>
<value>46</value> <value>54</value>
<value>51</value>
<value>48</value>
<value>45</value>
<value>43</value> <value>43</value>
<value>39</value> <value>42</value>
<value>35</value>
<value>34</value>
<value>32</value>
</array> </array>
<array name="cpu.core_speeds.cluster1"> <array name="cpu.core_speeds.cluster1">
<value>2400000</value>
<value>2314000</value> <value>2314000</value>
<value>2210000</value> <value>2210000</value>
<value>2106000</value> <value>2106000</value>
@@ -74,23 +75,24 @@
<value>507000</value> <value>507000</value>
</array> </array>
<array name="cpu.core_power.cluster1"> <array name="cpu.core_power.cluster1">
<value>382</value> <value>415</value>
<value>285</value> <value>367</value>
<value>250</value> <value>283</value>
<value>223</value> <value>241</value>
<value>199</value> <value>216</value>
<value>178</value> <value>196</value>
<value>156</value> <value>176</value>
<value>155</value>
<value>139</value> <value>139</value>
<value>130</value> <value>129</value>
<value>117</value> <value>119</value>
<value>100</value> <value>104</value>
<value>86</value> <value>91</value>
<value>84</value>
<value>77</value> <value>77</value>
<value>70</value> <value>72</value>
<value>64</value> <value>66</value>
<value>57</value> <value>59</value>
<value>51</value>
</array> </array>
<array name="cpu.core_speeds.cluster2"> <array name="cpu.core_speeds.cluster2">
<value>2730000</value> <value>2730000</value>
@@ -116,32 +118,32 @@
<value>520000</value> <value>520000</value>
</array> </array>
<array name="cpu.core_power.cluster2"> <array name="cpu.core_power.cluster2">
<value>1301</value> <value>1067</value>
<value>1208</value> <value>1001</value>
<value>1028</value> <value>835</value>
<value>837</value> <value>752</value>
<value>679</value> <value>621</value>
<value>610</value> <value>561</value>
<value>485</value> <value>443</value>
<value>425</value> <value>387</value>
<value>353</value> <value>328</value>
<value>307</value> <value>288</value>
<value>270</value> <value>254</value>
<value>241</value> <value>229</value>
<value>224</value> <value>213</value>
<value>193</value> <value>189</value>
<value>178</value> <value>174</value>
<value>153</value> <value>155</value>
<value>133</value> <value>132</value>
<value>115</value> <value>118</value>
<value>105</value> <value>112</value>
<value>94</value> <value>101</value>
<value>83</value> <value>92</value>
</array> </array>
<item name="cpu.suspend">4.99</item> <item name="cpu.suspend">7.2</item>
<item name="cpu.idle">20</item> <item name="cpu.idle">27</item>
<item name="battery.capacity">4000</item> <item name="battery.capacity">3400</item>
<item name="battery.typical.capacity">4100</item> <item name="battery.typical.capacity">3500</item>
<item name="wifi.controller.idle">1</item> <item name="wifi.controller.idle">1</item>
<item name="wifi.controller.rx">65</item> <item name="wifi.controller.rx">65</item>
<item name="wifi.controller.tx">265</item> <item name="wifi.controller.tx">265</item>
@@ -160,15 +162,15 @@
<item name="bluetooth.controller.rx">10</item> <item name="bluetooth.controller.rx">10</item>
<item name="bluetooth.controller.tx">10</item> <item name="bluetooth.controller.tx">10</item>
<array name="gpu.active"> <array name="gpu.active">
<value>78</value> <value>73</value>
<value>105</value> <value>95</value>
<value>128</value> <value>115</value>
<value>160</value> <value>138</value>
<value>230</value> <value>205</value>
<value>266</value> <value>235</value>
<value>389</value> <value>333</value>
<value>458</value> <value>408</value>
<value>516</value> <value>515</value>
</array> </array>
<array name="gpu.speeds"> <array name="gpu.speeds">
<value>156000</value> <value>156000</value>
@@ -179,40 +181,6 @@
<value>433000</value> <value>433000</value>
<value>572000</value> <value>572000</value>
<value>650000</value> <value>650000</value>
<value>702000</value> <value>754000</value>
</array>
<array name="speaker.media">
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
</array>
<array name="speaker.call">
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value>0</value>
</array> </array>
</device> </device>

View File

@@ -1,4 +1,4 @@
# Proprietary files - from Samsung package version G975FXXSBFUE6, unless pinned # Proprietary files - from Samsung package version N970FXXS7FUEB, unless pinned
## Audio ## Audio
vendor/etc/floating_feature.xml vendor/etc/floating_feature.xml
@@ -14,15 +14,13 @@ vendor/firmware/AP_AUDIO_SLSI.bin
vendor/firmware/SoundBoosterParam.bin vendor/firmware/SoundBoosterParam.bin
## Bluetooth Firmware ## Bluetooth Firmware
vendor/firmware/bcm4375B0_murata.hcd
vendor/firmware/bcm4375B0_semco.hcd
vendor/firmware/bcm4375B1_murata.hcd vendor/firmware/bcm4375B1_murata.hcd
vendor/firmware/bcm4375B1_semco.hcd vendor/firmware/bcm4375B1_semco.hcd
vendor/firmware/bcm4375B1_semco_sem.hcd vendor/firmware/bcm4375B1_semco_sem.hcd
## Camera ## Camera
vendor/lib/hw/camera.exynos9820.so vendor/lib/hw/camera.exynos9825.so:vendor/lib/hw/camera.exynos9820.so
vendor/lib64/hw/camera.exynos9820.so vendor/lib64/hw/camera.exynos9825.so:vendor/lib64/hw/camera.exynos9820.so
## Camera dependencies ## Camera dependencies
vendor/lib/libexynoscamera3.so vendor/lib/libexynoscamera3.so
@@ -41,7 +39,7 @@ vendor/firmware/cs35l40-rcv-dsp1-spk-prot-calib.bin
vendor/firmware/cs35l40-rcv-dsp1-spk-prot.bin vendor/firmware/cs35l40-rcv-dsp1-spk-prot.bin
vendor/firmware/fimc_is_fw_mcu.bin vendor/firmware/fimc_is_fw_mcu.bin
vendor/firmware/setfile_2l4.bin vendor/firmware/setfile_2l4.bin
vendor/firmware/setfile_3m3.bin vendor/firmware/setfile_3m5.bin
vendor/firmware/setfile_3p9.bin vendor/firmware/setfile_3p9.bin
## GPS ## GPS

View File

@@ -14,7 +14,7 @@ fi
set -e set -e
export DEVICE=beyond2lte export DEVICE=d1
export DEVICE_COMMON=exynos9820-common export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung export VENDOR=samsung