Snap for 11623990 from 024418b3a2 to 24Q3-release
Change-Id: I352692a259083a44cc869bae844e04b09d3e4452
This commit is contained in:
@@ -289,8 +289,10 @@ PRODUCT_PACKAGES += \
|
||||
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% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
@@ -326,8 +328,10 @@ PRODUCT_VENDOR_PROPERTIES += \
|
||||
# Fingerprint HAL
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
|
||||
@@ -233,8 +233,10 @@ PRODUCT_PACKAGES += \
|
||||
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% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
|
||||
@@ -275,8 +275,10 @@ PRODUCT_PACKAGES += \
|
||||
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% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
@@ -308,8 +310,10 @@ PRODUCT_VENDOR_PROPERTIES += \
|
||||
# Fingerprint HAL
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
|
||||
@@ -29,8 +29,10 @@ 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% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
|
||||
@@ -420,6 +420,33 @@
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskHigh",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskMid",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskLow",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "FGPreferIdle",
|
||||
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
|
||||
@@ -805,6 +832,18 @@
|
||||
"Duration": 1000,
|
||||
"Value": "0-3"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "TAPreferredIdleMaskHigh",
|
||||
"Duration": 5000,
|
||||
"Value": "0x1ff"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "TAPreferredIdleMaskMid",
|
||||
"Duration": 5000,
|
||||
"Value": "0x1ff"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "ReducePreferIdle",
|
||||
|
||||
@@ -406,6 +406,33 @@
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskHigh",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskMid",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskLow",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "FGPreferIdle",
|
||||
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
|
||||
@@ -827,6 +854,18 @@
|
||||
"Duration": 1000,
|
||||
"Value": "0-3"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "TAPreferredIdleMaskHigh",
|
||||
"Duration": 5000,
|
||||
"Value": "0x1ff"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "TAPreferredIdleMaskMid",
|
||||
"Duration": 5000,
|
||||
"Value": "0x1ff"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "ReducePreferIdle",
|
||||
|
||||
@@ -420,6 +420,33 @@
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskHigh",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskMid",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "TAPreferredIdleMaskLow",
|
||||
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
|
||||
"Values": [
|
||||
"0x1ff",
|
||||
"0xff"
|
||||
],
|
||||
"ResetOnInit": true
|
||||
},
|
||||
{
|
||||
"Name": "FGPreferIdle",
|
||||
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
|
||||
@@ -805,6 +832,18 @@
|
||||
"Duration": 1000,
|
||||
"Value": "0-3"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "TAPreferredIdleMaskHigh",
|
||||
"Duration": 5000,
|
||||
"Value": "0x1ff"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "TAPreferredIdleMaskMid",
|
||||
"Duration": 5000,
|
||||
"Value": "0x1ff"
|
||||
},
|
||||
{
|
||||
"PowerHint": "LAUNCH",
|
||||
"Node": "ReducePreferIdle",
|
||||
|
||||
@@ -29,8 +29,10 @@ USES_DEVICE_GOOGLE_SHUSKY := true
|
||||
|
||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
||||
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
|
||||
@@ -29,8 +29,10 @@ 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% AP3%,$(RELEASE_PLATFORM_VERSION)))
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user