From c727cf6fc547e8ec0e85dd7d4104f940bb775690 Mon Sep 17 00:00:00 2001 From: leonardian Date: Fri, 17 May 2024 12:07:42 +0000 Subject: [PATCH 01/19] conf: Enable access for braking time sysfs nodes Sysfs nodes: - braking_time_bank - braking_time_index - braking_time_ms Bug: 325121485 Test: Open sysfs nodes successfully during HAL init Change-Id: I88f59ca68028ea7fe1c2a7e61c6bf61ab647169b Signed-off-by: leonardian --- conf/init.husky.rc | 3 +++ conf/init.shiba.rc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/conf/init.husky.rc b/conf/init.husky.rc index 17b081e..ffd9bd8 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -68,6 +68,9 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index 8c88141..b30f54f 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -62,6 +62,9 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/default/num_waves + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index + chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable From dbbeb5592d7bcd71e20e50422375e7dbe4e3612d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:07:15 +0000 Subject: [PATCH 02/19] Update shiba SVN to 28 Bug: 342381152 Change-Id: Ib715c678925f017ef61b90b5331a705745ccd7ef --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e83d420..1cdcde1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 1fd7be6ff6a4b00b907c7ef5096869938075e882 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:09:10 +0000 Subject: [PATCH 03/19] Update husky SVN to 28 Bug: 342381152 Change-Id: Iebe683d60093eecbf7aa8fb417c390e5180abfc9 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index ec1c18b..b907d73 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From a7d44dbb505092e6b99126ff5feb96cce9b8404c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:20:52 +0000 Subject: [PATCH 04/19] Update husky SVN to 29 Bug: 342381152 Change-Id: I984a575909fd74ba78148bf39b5a109ecbf7bc3f --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index b907d73..979a85e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From d650a1559a58ababa3feaaea2a44e4b4f81f829a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:22:16 +0000 Subject: [PATCH 05/19] Update shiba SVN to 29 Bug: 342381152 Change-Id: Ie294dbfad34544b20386d019edf8d24819aa1f6d --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 1cdcde1..dd66319 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From d3b792b4eb5f18463495f655db81e8c3927cb431 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 5 Jun 2024 07:22:49 +0000 Subject: [PATCH 06/19] thermal: Move TPU to the VSKIN-SOC PID loop Bug: 345115917 Test: run TPU test Change-Id: I372473dcedc35ea82ccc739f0ac185a8a83dfa53 Signed-off-by: Peter (YM) --- thermal/thermal_info_config_husky.json | 22 ++++++++++++++++------ thermal/thermal_info_config_shiba.json | 22 ++++++++++++++++------ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index b08761a..d25340f 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -327,10 +327,6 @@ "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -603,7 +599,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -623,7 +619,7 @@ "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], - "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] }, @@ -663,6 +659,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 8, 8, 8, 9, 11, 11], "LimitInfo": [0, 0, 0, 0, 0, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1138,6 +1143,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index bc6bdf1..a46f42e 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -295,10 +295,6 @@ "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -571,7 +567,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -591,7 +587,7 @@ "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], - "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] }, @@ -631,6 +627,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 9, 9, 9, 9, 11, 11], "LimitInfo": [0, 0, 0, 0, 0, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1171,6 +1176,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, From b085ae1f72b6821c4f6e2bbf0e741148775346d8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:08:32 +0000 Subject: [PATCH 07/19] Update shiba SVN to 30 Bug: 342381152 Change-Id: I2ef29057958ba6e31c76973de70d69577c1befe5 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index dd66319..e071016 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 98ed4cdd4eb4b4e8deb094478a8a351bea7a6cdc Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:10:47 +0000 Subject: [PATCH 08/19] Update shiba SVN to 31 Bug: 342381152 Change-Id: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e071016..0460cb1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From d3e5bfd7a40cb6652407777caadb206c07171cf8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:13:33 +0000 Subject: [PATCH 09/19] Update shiba SVN to 32 Bug: 342381152 Change-Id: I18527bb9a4358c14b2e99646670f0ab2da8173f0 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 0460cb1..321699c 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From a7b24379b54da71b59da2c80dc3ede5ce83beafd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:15:27 +0000 Subject: [PATCH 10/19] Update husky SVN to 30 Bug: 342381152 Change-Id: Icdbc5cd31dbca584589f703c16aa18698f7de294 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 979a85e..316430b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 810570db667f583164ab6af56df0ecbe9756b1d6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:17:07 +0000 Subject: [PATCH 11/19] Update husky SVN to 31 Bug: 342381152 Change-Id: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 316430b..52ba5b0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From fe6c3b8adfa981b440aaf8250b633ca5db4de643 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:18:42 +0000 Subject: [PATCH 12/19] Update husky SVN to 32 Bug: 342381152 Change-Id: Icb9de546d095ed4d97e52cc32c1b034856ccd6fb --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 52ba5b0..88db0f7 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -405,7 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From bcafadef9c0a02b071a760c11ad332e40a7965a9 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 7 Jun 2024 16:20:50 +0000 Subject: [PATCH 13/19] Increase PMU_MID_SPC_THRESHOLD to 23 for 60fps Test results show that increasing Spc threshold for mid core to 23 can help with framedrop rate without affecting the power. Bug: 317052150 Test: https://docs.google.com/spreadsheets/d/1bpSfVptz8nolSPfeYfkbjnP9pIK3l-U1JyqPNCwOwLc/edit?resourcekey=0-oiFKaxI6PtSGR6yXed327w&gid=430808958#gid=430808958 Change-Id: I9d5efbc0b7465825b36bff0dc70671121198b8c3 --- perf/powerhint-husky.json | 4 ++-- perf/powerhint-ripcurrent.json | 4 ++-- perf/powerhint-shiba.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index b944c9c..1c29123 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -718,7 +718,7 @@ "Values": [ "50", "30", - "20", + "23", "18" ], "DefaultIndex": 0 @@ -1891,7 +1891,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "20" + "Value": "23" }, { "PowerHint": "CAMERA_STREAMING_HIGH", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index f5f1ca1..48af0bb 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -764,7 +764,7 @@ "Values": [ "50", "30", - "20", + "23", "18" ], "DefaultIndex": 0 @@ -1740,7 +1740,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "20" + "Value": "23" }, { "PowerHint": "CAMERA_STREAMING_HIGH", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c9ca7d2..fb000e1 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -718,7 +718,7 @@ "Values": [ "50", "30", - "20", + "23", "18" ], "DefaultIndex": 0 @@ -1795,7 +1795,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "20" + "Value": "23" }, { "PowerHint": "CAMERA_STREAMING_HIGH", From d81c86e9a42d2eed1ddc6621283afadf2e0a4cb6 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Mon, 10 Jun 2024 15:08:45 -0700 Subject: [PATCH 14/19] Remove entries for unlunchable targets Bug: 346406752 Test: Treehugger Change-Id: I1f2f9690e5c70799acb8e15b382c7bc1ae7282d5 --- AndroidProducts.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index fb1ae52..b343f20 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -19,12 +19,10 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \ $(LOCAL_DIR)/factory_ripcurrent.mk \ $(LOCAL_DIR)/aosp_husky.mk \ - $(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \ $(LOCAL_DIR)/aosp_husky_fullmte.mk \ $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \ $(LOCAL_DIR)/factory_husky.mk \ $(LOCAL_DIR)/aosp_shiba.mk \ - $(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \ $(LOCAL_DIR)/aosp_shiba_fullmte.mk \ $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \ $(LOCAL_DIR)/factory_shiba.mk From ef1a3cc69881d54a5e3b9c3179f115f03a576001 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Fri, 16 Feb 2024 16:26:44 +0800 Subject: [PATCH 15/19] audio: add sound dose offset curve Bug: 313395588 Test: boot to home, HIDL/AIDL w/wo xml configuration Change-Id: I5d5b2e74f46eb0ca6d1f21b29e22019d9b3f25fa Signed-off-by: vincenttew --- audio/husky/config/audio_platform_configuration.xml | 2 +- audio/shiba/config/audio_platform_configuration.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 60f0be3..3c403c1 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -308,7 +308,7 @@ - + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 60f0be3..3c403c1 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -308,7 +308,7 @@ - + From 5011c28eab80d3fbd2b6f9be7f2d6d51a4976aab Mon Sep 17 00:00:00 2001 From: chenkris Date: Fri, 21 Jun 2024 04:04:48 +0000 Subject: [PATCH 16/19] =?UTF-8?q?Build=20g7=5Ftrusty=5Fnext=20for=20?= =?UTF-8?q?=E2=80=9Cnext=E2=80=9D=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 348542941 Test: build Change-Id: Ie4c8e606980580189d63fb4764428b6aacdefdaa --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index aad692e..eb94b55 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -322,7 +322,11 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL +ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) +GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next +else GOODIX_CONFIG_BUILD_VERSION := g7_trusty +endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) diff --git a/device-shiba.mk b/device-shiba.mk index 4965a07..23a587a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -305,7 +305,11 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL +ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) +GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next +else GOODIX_CONFIG_BUILD_VERSION := g7_trusty +endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) From 357cc1f618589e8d6664dbee856061428c221ebc Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 24 Jun 2024 11:24:07 +0000 Subject: [PATCH 17/19] =?UTF-8?q?Revert=20"Build=20g7=5Ftrusty=5Fnext=20fo?= =?UTF-8?q?r=20=E2=80=9Cnext=E2=80=9D=20configuration"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5011c28eab80d3fbd2b6f9be7f2d6d51a4976aab. Bug: 348542941 Test: build Change-Id: I26464d764de6964bc66126ef152ffcf068b8ce1c --- device-husky.mk | 4 ---- device-shiba.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index eb94b55..aad692e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -322,11 +322,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) -GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next -else GOODIX_CONFIG_BUILD_VERSION := g7_trusty -endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) diff --git a/device-shiba.mk b/device-shiba.mk index 23a587a..4965a07 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -305,11 +305,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) -GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next -else GOODIX_CONFIG_BUILD_VERSION := g7_trusty -endif APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) From fa60355a21dc6bdc9fc38a7651f33115b152bd50 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 05:36:24 +0000 Subject: [PATCH 18/19] gps: Set configuration by kernel version Bug: 258364350 Test: Verification at b/258364350. Test: Function verification at b/258364350. Test: Compile and verify the configuration is correct. Change-Id: I7d6521bef3605dc725c9a9e34f27217ccae42d4e --- device-husky.mk | 21 +++++-- device-shiba.mk | 21 +++++-- location/gps.6.1.xml.hk3 | 108 ++++++++++++++++++++++++++++++++++ location/gps.6.1.xml.sb3 | 108 ++++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.hk3 | 107 +++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.sb3 | 107 +++++++++++++++++++++++++++++++++ location/lhd.conf | 1 + location/lhd_user.conf | 1 + 8 files changed, 466 insertions(+), 8 deletions(-) create mode 100644 location/gps.6.1.xml.hk3 create mode 100644 location/gps.6.1.xml.sb3 create mode 100644 location/gps_user.6.1.xml.hk3 create mode 100644 location/gps_user.6.1.xml.sb3 diff --git a/device-husky.mk b/device-husky.mk index eb94b55..ee3abc2 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -304,16 +304,29 @@ include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer +# Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps.6.1.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps_user.6.1.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps_user.xml.hk3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set zram size diff --git a/device-shiba.mk b/device-shiba.mk index 23a587a..a026d4d 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -287,16 +287,29 @@ include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer +# Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/shusky/location/gps_user.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else PRODUCT_COPY_FILES += \ - device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ device/google/shusky/location/gps_user.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set zram size diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 new file mode 100644 index 0000000..beba2bb --- /dev/null +++ b/location/gps.6.1.xml.hk3 @@ -0,0 +1,108 @@ + + + + + + + + + + diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 new file mode 100644 index 0000000..fe5065b --- /dev/null +++ b/location/gps.6.1.xml.sb3 @@ -0,0 +1,108 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 new file mode 100644 index 0000000..a6ddbce --- /dev/null +++ b/location/gps_user.6.1.xml.hk3 @@ -0,0 +1,107 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 new file mode 100644 index 0000000..4248a7b --- /dev/null +++ b/location/gps_user.6.1.xml.sb3 @@ -0,0 +1,107 @@ + + + + + + + + + + diff --git a/location/lhd.conf b/location/lhd.conf index c430b93..a0183a4 100644 --- a/location/lhd.conf +++ b/location/lhd.conf @@ -31,3 +31,4 @@ SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf SkipSensorWakeLock=true LoggerWakeLockEnable=false +PpsEnable=true diff --git a/location/lhd_user.conf b/location/lhd_user.conf index 73e03bc..d861fec 100644 --- a/location/lhd_user.conf +++ b/location/lhd_user.conf @@ -29,3 +29,4 @@ TrafficLogEnabled=false SkipSensorWakeLock=true LoggerWakeLockEnable=false +PpsEnable=true From 73c64fff2104a5accaec04816d692e6a5159f3e8 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Wed, 26 Jun 2024 21:28:09 -0700 Subject: [PATCH 19/19] 16kb: Use PRODUCT_BOOTS_16K to select the kernel and fs The build flag PRODUCT_BOOTS_16K will be used to select whether the shusky devices boot with 16kb kernel or 4kb kernel. Bug: 346868433 Test: Built Pixel 8 targets $ source build/envsetup.sh $ lunch husky_pgagnostic-trunk_staging-userdebug $ get_build_var DEVICE_PAGE_AGNOSTIC $ get_build_var TARGET_KERNEL_DIR device/google/shusky-kernels/6.1/trunk-12010727/16kb $ get_build_var TARGET_BOARD_KERNEL_HEADERS device/google/shusky-kernels/6.1/trunk-12010727/kernel-headers $ get_build_var PRODUCT_BOOTS_16K true $ get_build_var TARGET_RW_FILE_SYSTEM_TYPE ext4 $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE ext4 Flag: EXEMPT bugfix Change-Id: Ia75c7f8cfca6d651777c730a3f86715a0991fbec --- device-husky.mk | 4 +--- device-shiba.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index aad692e..93d9742 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -31,9 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) include device/google/shusky/uwb/uwb_calibration.mk endif -DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +ifeq ($(PRODUCT_BOOTS_16K),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb TARGET_RW_FILE_SYSTEM_TYPE := ext4 diff --git a/device-shiba.mk b/device-shiba.mk index 4965a07..a2c19b9 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -24,9 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers LOCAL_PATH := device/google/shusky -DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +ifeq ($(PRODUCT_BOOTS_16K),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb TARGET_RW_FILE_SYSTEM_TYPE := ext4