Snap for 11722130 from 6ae60dd4b7 to 24Q3-release

Change-Id: Iaa58744b529a821d03a171495400c1797e63aad8
This commit is contained in:
Android Build Coastguard Worker 2024-04-16 23:03:15 +00:00
commit 23603215d9
6 changed files with 18 additions and 33 deletions

View file

@ -17,18 +17,10 @@
# Restrict the visibility of Android.bp files to improve build analysis time # Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION)
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
# Keeps flexibility for kasan and ufs builds # Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_HUSKY_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
endif
LOCAL_PATH := device/google/shusky LOCAL_PATH := device/google/shusky

View file

@ -17,17 +17,9 @@
# Restrict the visibility of Android.bp files to improve build analysis time # Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION)
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers TARGET_KERNEL_DIR := $(RELEASE_KERNEL_RIPCURRENT_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true

View file

@ -17,18 +17,10 @@
# Restrict the visibility of Android.bp files to improve build analysis time # Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
# Keeps flexibility for kasan and ufs builds # Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
endif
LOCAL_PATH := device/google/shusky LOCAL_PATH := device/google/shusky

View file

@ -3074,6 +3074,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },
@ -3108,6 +3109,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },
@ -3142,6 +3144,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },

View file

@ -2854,6 +2854,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },
@ -2886,6 +2887,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },
@ -2918,6 +2920,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },

View file

@ -2978,6 +2978,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },
@ -3012,6 +3013,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },
@ -3046,6 +3048,7 @@
"HBoostOffMissedCycles": 5, "HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5, "HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300
}, },