diff --git a/aosp_raven.mk b/aosp_raven.mk index 6a29283..f434886 100644 --- a/aosp_raven.mk +++ b/aosp_raven.mk @@ -15,7 +15,7 @@ # $(call inherit-product, device/google/gs101/aosp_common.mk) -$(call inherit-product, device/google/raviole/device-raven.mk) +$(call inherit-product, device/google/raviole/raven_generic.mk) PRODUCT_NAME := aosp_raven PRODUCT_NAME_FOR_ATTESTATION := raven diff --git a/aosp_slider.mk b/aosp_slider.mk index 29351f5..9e65926 100644 --- a/aosp_slider.mk +++ b/aosp_slider.mk @@ -14,7 +14,7 @@ # limitations under the License. # $(call inherit-product, device/google/gs101/aosp_common.mk) -$(call inherit-product, device/google/raviole/device-slider.mk) +$(call inherit-product, device/google/raviole/slider_generic.mk) PRODUCT_NAME := aosp_slider PRODUCT_DEVICE := slider diff --git a/aosp_whitefin.mk b/aosp_whitefin.mk index bcdd616..212e7a6 100644 --- a/aosp_whitefin.mk +++ b/aosp_whitefin.mk @@ -14,7 +14,7 @@ # limitations under the License. # $(call inherit-product, device/google/gs101/aosp_common.mk) -$(call inherit-product, device/google/raviole/device-whitefin.mk) +$(call inherit-product, device/google/raviole/whitefin_generic.mk) PRODUCT_NAME := aosp_whitefin PRODUCT_DEVICE := whitefin diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index b40204e..03a695e 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index a55b5d1..ab9a002 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml index 72748dd..2e898e5 100644 --- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index a55b5d1..ab9a002 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml index 72748dd..2e898e5 100644 --- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - 50px + 67px + 67px + 66px 5px diff --git a/raven_generic.mk b/raven_generic.mk new file mode 100644 index 0000000..6b16105 --- /dev/null +++ b/raven_generic.mk @@ -0,0 +1,20 @@ +# +# Copyright 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. +# + +$(call inherit-product, device/google/raviole/device-raven.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/raven diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 0c3d11f..917b79a 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -15,13 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 560 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/slider_generic.mk b/slider_generic.mk new file mode 100644 index 0000000..419e587 --- /dev/null +++ b/slider_generic.mk @@ -0,0 +1,20 @@ +# +# Copyright 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. +# + +$(call inherit-product, device/google/raviole/device-slider.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 372e851..ad24136 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -607,38 +607,6 @@ "Multiplier":1, "Hidden":true }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index c3289e2..6f3b0d0 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -597,38 +597,6 @@ "Multiplier":1, "Hidden":true }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index f08cd9f..16c795c 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -257,70 +257,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index f08cd9f..16c795c 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -257,70 +257,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index e824c17..e28f7bf 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -15,13 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 440 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/whitefin_generic.mk b/whitefin_generic.mk new file mode 100644 index 0000000..f0616c6 --- /dev/null +++ b/whitefin_generic.mk @@ -0,0 +1,20 @@ +# +# Copyright 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. +# + +$(call inherit-product, device/google/raviole/device-whitefin.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider