Snap for 12147630 from 2f948b2e66 to 24Q4-release

Change-Id: I849b7cebbfddff50253a9c41d11e4246e45e05b3
This commit is contained in:
Android Build Coastguard Worker 2024-07-27 01:01:37 +00:00
commit 96ef4e7997
8 changed files with 33 additions and 72 deletions

View file

@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
ifdef RELEASE_KERNEL_CAIMAN_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
include device/google/caimito/device-caimito-16k-common.mk
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers

View file

@ -0,0 +1,20 @@
#
# Copyright (C) 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
ifeq ($(TARGET_BOOTS_16K),true)
# Configures the 16kb kernel directory.
TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
endif

View file

@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
ifdef RELEASE_KERNEL_KOMODO_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
include device/google/caimito/device-caimito-16k-common.mk
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers

View file

@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
ifdef RELEASE_KERNEL_TOKAY_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
include device/google/caimito/device-caimito-16k-common.mk
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers

View file

@ -579,16 +579,6 @@
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "PowerHALLaunch",
"Path": "vendor.powerhal.is_launch",
"Values": [
"1",
"0"
],
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "BigTjOffset",
"Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@ -1130,12 +1120,6 @@
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH",
"Node": "PowerHALLaunch",
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
@ -1423,9 +1407,8 @@
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"PowerHint": "CAMERA_PA_KILL_BOOST",
"Node": "PA_KILL",
"EnableProperty": "vendor.powerhal.is_launch",
"Duration": 0,
"Value": "102400"
},

View file

@ -579,16 +579,6 @@
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "PowerHALLaunch",
"Path": "vendor.powerhal.is_launch",
"Values": [
"1",
"0"
],
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "BigTjOffset",
"Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@ -1130,12 +1120,6 @@
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH",
"Node": "PowerHALLaunch",
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
@ -1423,9 +1407,8 @@
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"PowerHint": "CAMERA_PA_KILL_BOOST",
"Node": "PA_KILL",
"EnableProperty": "vendor.powerhal.is_launch",
"Duration": 0,
"Value": "102400"
},

View file

@ -569,16 +569,6 @@
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "PowerHALLaunch",
"Path": "vendor.powerhal.is_launch",
"Values": [
"1",
"0"
],
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "INTCAMFreq",
"Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
@ -1056,12 +1046,6 @@
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH",
"Node": "PowerHALLaunch",
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
@ -1343,9 +1327,8 @@
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"PowerHint": "CAMERA_PA_KILL_BOOST",
"Node": "PA_KILL",
"EnableProperty": "vendor.powerhal.is_launch",
"Duration": 0,
"Value": "102400"
},

View file

@ -579,16 +579,6 @@
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "PowerHALLaunch",
"Path": "vendor.powerhal.is_launch",
"Values": [
"1",
"0"
],
"Type": "Property",
"ResetOnInit": true
},
{
"Name": "BigTjOffset",
"Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@ -1130,12 +1120,6 @@
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH",
"Node": "PowerHALLaunch",
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
@ -1423,9 +1407,8 @@
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"PowerHint": "CAMERA_PA_KILL_BOOST",
"Node": "PA_KILL",
"EnableProperty": "vendor.powerhal.is_launch",
"Duration": 0,
"Value": "102400"
},