From 7e6f1e6cf04c161c3e3232286a8e1c4a647113a7 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 16:27:53 +0800 Subject: [PATCH 1/2] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: I71813042214ef6407b6389a1f2e57c1ffd84a2f9 --- device-husky.mk | 19 +------------------ device-ripcurrent.mk | 9 --------- device-shiba.mk | 19 +------------------ husky/BoardConfig.mk | 13 +++---------- ripcurrent/BoardConfig.mk | 12 +++--------- shiba/BoardConfig.mk | 12 +++--------- 6 files changed, 11 insertions(+), 73 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 0859770..a54ba8c 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -279,15 +279,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk -endif # UWB PRODUCT_SOONG_NAMESPACES += \ @@ -318,16 +309,8 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q3 -else -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk -endif GOODIX_CONFIG_BUILD_VERSION := g7_trusty +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)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 40a9900..43c0795 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -223,15 +223,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk -endif # UWB PRODUCT_SOONG_NAMESPACES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 0b8e4a7..52018c3 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -265,15 +265,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk -endif # Location # SDK build system @@ -300,16 +291,8 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q3 -else -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk -endif GOODIX_CONFIG_BUILD_VERSION := g7_trusty +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)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index e77c4ff..18bae21 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -27,16 +27,9 @@ TARGET_BOOTLOADER_BOARD_NAME := husky RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif - +RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index dd8cd7a..f7ec3e1 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -27,15 +27,9 @@ TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_SHUSKY := true -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)) include device/google/shusky/device-shusky-common.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 940e42b..1e72f5b 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -27,15 +27,9 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk From 01660ca73656fb0506d133d36f0e5036c981bf88 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 18 Apr 2024 22:52:02 +0000 Subject: [PATCH 2/2] adpf:shusky: update hboost jank check time factor. Update it to align with the HWUI target duration scale factor, so the adjusted jank check time duration is same as expected frame timeline's duration. HWUI target duration scale factor is 70%, and its inverse value is approximately 1.43. Bug: 204204746 Test: adb shell dumpsys android.hardware.power.IPower/default; Check the device adpf sessions' traces. Change-Id: I8565fa1352769e6f879ea5fc12412d00f254da3b --- perf/powerhint-husky.json | 6 +++--- perf/powerhint-ripcurrent.json | 6 +++--- perf/powerhint-shiba.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 5fff44d..92546e9 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2992,7 +2992,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3027,7 +3027,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3062,7 +3062,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 5020144..54d9930 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2772,7 +2772,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -2805,7 +2805,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -2838,7 +2838,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c443237..4335bd7 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2896,7 +2896,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -2931,7 +2931,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -2966,7 +2966,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 },