Snap for 11740859 from d34ee0e34b
to 24Q3-release
Change-Id: I5e71bc7e84c7f32f59249f7f9e03face2233cfa8
This commit is contained in:
commit
80216644d3
9 changed files with 20 additions and 82 deletions
|
@ -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)
|
||||
|
|
|
@ -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 += \
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -3074,7 +3074,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
@ -3109,7 +3109,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
@ -3144,7 +3144,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
|
|
@ -2854,7 +2854,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
@ -2887,7 +2887,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
@ -2920,7 +2920,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
|
|
@ -2978,7 +2978,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
@ -3013,7 +3013,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
@ -3048,7 +3048,7 @@
|
|||
"HBoostOffMissedCycles": 5,
|
||||
"HBoostPidPuFactor": 0.5,
|
||||
"HBoostUclampMin": 722,
|
||||
"JunkCheckTimeFactor": 1.2,
|
||||
"JankCheckTimeFactor": 1.43,
|
||||
"LowFrameRateThreshold": 25,
|
||||
"MaxRecordsNum": 300
|
||||
},
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue