Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Iffe880b97e0296047b9e2b9c9929d67d09d257b6
Change-Id: Id0639727057fc3de20e987ac6c1f30c557d31219
This commit is contained in:
Xin Li 2024-09-05 17:02:38 -07:00
commit b6f7a2a2e2
45 changed files with 358 additions and 437 deletions

View file

@ -15,7 +15,7 @@
# #
$(call inherit-product, device/google/gs101/aosp_common.mk) $(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 := aosp_raven
PRODUCT_NAME_FOR_ATTESTATION := raven PRODUCT_NAME_FOR_ATTESTATION := raven

View file

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
$(call inherit-product, device/google/gs101/aosp_common.mk) $(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_NAME := aosp_slider
PRODUCT_DEVICE := slider PRODUCT_DEVICE := slider

View file

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
$(call inherit-product, device/google/gs101/aosp_common.mk) $(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_NAME := aosp_whitefin
PRODUCT_DEVICE := whitefin PRODUCT_DEVICE := whitefin

View file

@ -135,10 +135,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -149,8 +145,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -158,8 +152,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -135,10 +135,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -149,8 +145,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -158,8 +152,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"> <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -131,10 +131,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -145,8 +141,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -154,8 +148,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"> <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -135,10 +135,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -149,8 +145,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -158,8 +152,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
HEADSET_MUSIC = OM:2,SM:2
######################################################################################################## ########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it. # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_CONTROLS] [HAL_SUPPORTED_CONTROLS]
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
[COEFS_CONVERTER_SETTING] [COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so

View file

@ -135,10 +135,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -149,8 +145,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -158,8 +152,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -135,10 +135,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -149,8 +145,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -158,8 +152,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"> <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -131,10 +131,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -145,8 +141,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -154,8 +148,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"> <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -135,10 +135,6 @@
</devicePort> </devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink"> <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink"> <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort> </devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink"> <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -149,8 +145,6 @@
</devicePort> </devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort> </devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort> </devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT --> <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -158,8 +152,6 @@
</devicePort> </devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort> </devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
HEADSET_MUSIC = OM:2,SM:2
######################################################################################################## ########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it. # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_CONTROLS] [HAL_SUPPORTED_CONTROLS]
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
[COEFS_CONVERTER_SETTING] [COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so

View file

@ -2,4 +2,7 @@
BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
# Update BQR Event Mask property value
BqrEventMaskValueUpdate = 262238
BtOpusEnabled = true BtOpusEnabled = true

View file

@ -17,17 +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)
TARGET_KERNEL_DIR ?= device/google/raviole-kernel TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers # Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
endif
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@ -48,13 +41,6 @@ include device/google/gs-common/touch/stm/stm11.mk
# Fingerprint HAL # Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g6_trusty GOODIX_CONFIG_BUILD_VERSION := g6_trusty
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
endif
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),) ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@ -207,8 +193,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
endif endif
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
ifdef RELEASE_SVN_ORIOLE
TARGET_SVN ?= $(RELEASE_SVN_ORIOLE)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 85
endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=82 ro.vendor.build.svn=$(TARGET_SVN)
# Set support hide display cutout feature # Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -246,13 +239,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
endif
# Set support one-handed mode # Set support one-handed mode
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \

View file

@ -17,17 +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)
TARGET_KERNEL_DIR ?= device/google/raviole-kernel TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION)
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers # Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR)
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RAVEN_DIR)/kernel-headers
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
endif
$(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
@ -48,13 +41,6 @@ include device/google/gs-common/touch/lsi/lsi.mk
# Fingerprint HAL # Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g6_trusty GOODIX_CONFIG_BUILD_VERSION := g6_trusty
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
endif
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),) ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@ -211,8 +197,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
endif endif
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
ifdef RELEASE_SVN_RAVEN
TARGET_SVN ?= $(RELEASE_SVN_RAVEN)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 85
endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=82 ro.vendor.build.svn=$(TARGET_SVN)
# Set support hide display cutout feature # Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -254,13 +247,6 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
endif
# Set support one-handed mode # Set support one-handed mode
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \

View file

@ -14,8 +14,9 @@
# limitations under the License. # limitations under the License.
# #
TARGET_KERNEL_DIR ?= device/google/raviole-kernel # Keeps flexibility for kasan and ufs builds
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@ -105,13 +106,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
endif
# tetheroffload HAL # tetheroffload HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View file

@ -14,8 +14,9 @@
# limitations under the License. # limitations under the License.
# #
TARGET_KERNEL_DIR ?= device/google/raviole-kernel # Keeps flexibility for kasan and ufs builds
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@ -88,13 +89,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
endif
# tetheroffload HAL # tetheroffload HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View file

@ -32,3 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Factory binaries of camera # Factory binaries of camera
PRODUCT_PACKAGES += fatp_gn1_hat_tool fatp_imx586_hat_tool PRODUCT_PACKAGES += fatp_gn1_hat_tool fatp_imx586_hat_tool
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

View file

@ -23,3 +23,6 @@ PRODUCT_DEVICE := slider
PRODUCT_MODEL := Factory build on Slider PRODUCT_MODEL := Factory build on Slider
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google PRODUCT_MANUFACTURER := Google
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

View file

@ -29,3 +29,5 @@ PRODUCT_MANUFACTURER := Google
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

View file

@ -35,7 +35,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"
@ -68,7 +68,7 @@
<gll <gll
PpsEnable="true" PpsEnable="true"
LogPriMask="LOG_INFO" LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI" LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5" MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON" MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"

View file

@ -35,7 +35,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"
@ -68,7 +68,7 @@
<gll <gll
PpsEnable="true" PpsEnable="true"
LogPriMask="LOG_INFO" LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI" LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5" MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON" MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"

View file

@ -35,7 +35,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"
@ -68,7 +68,7 @@
<gll <gll
PpsEnable="true" PpsEnable="true"
LogPriMask="LOG_INFO" LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI" LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5" MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON" MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"

View file

@ -34,7 +34,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -34,7 +34,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -34,7 +34,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -18,19 +18,16 @@
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential # The modules which need to be loaded in sequential
BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
ifdef AUTOMOTIVE_PRODUCT_PATH ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu #RBC# include_top device/google/auto_tcu

View file

@ -1230,16 +1230,25 @@
"PID_Du": 0, "PID_Du": 0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 232, "UclampMin_Init": 232,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330, "ReportingRateLimitNs": 83333330,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 15 "StaleTimeFactor": 15,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -1254,16 +1263,25 @@
"PID_Du": 0, "PID_Du": 0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110, "ReportingRateLimitNs": 111111110,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 15 "StaleTimeFactor": 15,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -1278,16 +1296,25 @@
"PID_Du": 0, "PID_Du": 0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660, "ReportingRateLimitNs": 166666660,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 15 "StaleTimeFactor": 15,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -1332,8 +1359,6 @@
"UclampMin_High": 53, "UclampMin_High": 53,
"UclampMin_Low": 53, "UclampMin_Low": 53,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 5 "StaleTimeFactor": 5
}, },
@ -1356,8 +1381,6 @@
"UclampMin_High": 0, "UclampMin_High": 0,
"UclampMin_Low": 0, "UclampMin_Low": 0,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 5 "StaleTimeFactor": 5
} }

View file

@ -1746,16 +1746,26 @@
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 232, "UclampMin_Init": 232,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330, "ReportingRateLimitNs": 83333330,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -1770,16 +1780,26 @@
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110, "ReportingRateLimitNs": 111111110,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -1794,16 +1814,26 @@
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660, "ReportingRateLimitNs": 166666660,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -1823,9 +1853,8 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 197, "UclampMin_High": 197,
"UclampMin_Low": 197, "UclampMin_Low": 197,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0
}, },
@ -1847,9 +1876,8 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 53, "UclampMin_High": 53,
"UclampMin_Low": 53, "UclampMin_Low": 53,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0
}, },
@ -1871,9 +1899,8 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 0, "UclampMin_High": 0,
"UclampMin_Low": 0, "UclampMin_Low": 0,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0
} }

View file

@ -1211,16 +1211,25 @@
"PID_Du": 0, "PID_Du": 0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 232, "UclampMin_Init": 232,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330, "ReportingRateLimitNs": 83333330,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 15 "StaleTimeFactor": 15,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -1235,16 +1244,25 @@
"PID_Du": 0, "PID_Du": 0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110, "ReportingRateLimitNs": 111111110,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 15 "StaleTimeFactor": 15,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -1259,16 +1277,25 @@
"PID_Du": 0, "PID_Du": 0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660, "ReportingRateLimitNs": 166666660,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 15 "StaleTimeFactor": 15,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -1289,8 +1316,6 @@
"UclampMin_High": 197, "UclampMin_High": 197,
"UclampMin_Low": 197, "UclampMin_Low": 197,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 5 "StaleTimeFactor": 5
}, },
@ -1313,8 +1338,6 @@
"UclampMin_High": 53, "UclampMin_High": 53,
"UclampMin_Low": 53, "UclampMin_Low": 53,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 5 "StaleTimeFactor": 5
}, },
@ -1337,8 +1360,6 @@
"UclampMin_High": 0, "UclampMin_High": 0,
"UclampMin_Low": 0, "UclampMin_Low": 0,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1, "TargetTimeFactor": 1,
"StaleTimeFactor": 5 "StaleTimeFactor": 5
} }

View file

@ -1727,16 +1727,26 @@
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 232, "UclampMin_Init": 232,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330, "ReportingRateLimitNs": 83333330,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -1751,16 +1761,26 @@
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110, "ReportingRateLimitNs": 111111110,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -1775,16 +1795,26 @@
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660, "ReportingRateLimitNs": 166666660,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -1804,9 +1834,8 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 197, "UclampMin_High": 197,
"UclampMin_Low": 197, "UclampMin_Low": 197,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0
}, },
@ -1828,9 +1857,8 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 53, "UclampMin_High": 53,
"UclampMin_Low": 53, "UclampMin_Low": 53,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0
}, },
@ -1852,9 +1880,8 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 0, "UclampMin_High": 0,
"UclampMin_Low": 0, "UclampMin_Low": 0,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0
} }

View file

@ -1503,6 +1503,7 @@
"UclampMin_Init": 232, "UclampMin_Init": 232,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
@ -1510,7 +1511,16 @@
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0 "StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -1527,6 +1537,7 @@
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
@ -1534,7 +1545,16 @@
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0 "StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -1551,6 +1571,7 @@
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
@ -1558,7 +1579,16 @@
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0 "StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -1578,6 +1608,7 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 197, "UclampMin_High": 197,
"UclampMin_Low": 197, "UclampMin_Low": 197,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
@ -1602,6 +1633,7 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 53, "UclampMin_High": 53,
"UclampMin_Low": 53, "UclampMin_Low": 53,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
@ -1626,6 +1658,7 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 0, "UclampMin_High": 0,
"UclampMin_Low": 0, "UclampMin_Low": 0,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,

View file

@ -1470,6 +1470,7 @@
"UclampMin_Init": 232, "UclampMin_Init": 232,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
@ -1477,7 +1478,16 @@
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0 "StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -1494,6 +1504,7 @@
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
@ -1501,7 +1512,16 @@
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0 "StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -1518,6 +1538,7 @@
"UclampMin_Init": 162, "UclampMin_Init": 162,
"UclampMin_High": 480, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"UclampMax_Efficient": 400,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
@ -1525,7 +1546,16 @@
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0 "StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -1545,6 +1575,7 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 197, "UclampMin_High": 197,
"UclampMin_Low": 197, "UclampMin_Low": 197,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
@ -1569,6 +1600,7 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 53, "UclampMin_High": 53,
"UclampMin_Low": 53, "UclampMin_Low": 53,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
@ -1593,6 +1625,7 @@
"UclampMin_Init": 250, "UclampMin_Init": 250,
"UclampMin_High": 0, "UclampMin_High": 0,
"UclampMin_Low": 0, "UclampMin_Low": 0,
"UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,

View file

@ -18,19 +18,16 @@
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential # The modules which need to be loaded in sequential
BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
ifdef AUTOMOTIVE_PRODUCT_PATH ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu #RBC# include_top device/google/auto_tcu

View file

@ -43,7 +43,9 @@
<!-- Radius of the software rounded corners. --> <!-- Radius of the software rounded corners. -->
<dimen name="rounded_corner_radius">50px</dimen> <dimen name="rounded_corner_radius">67px</dimen>
<dimen name="rounded_corner_radius_top">67px</dimen>
<dimen name="rounded_corner_radius_bottom">66px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. --> <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">5px</dimen> <dimen name="rounded_corner_radius_adjustment">5px</dimen>

20
raven_generic.mk Normal file
View file

@ -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

View file

@ -15,13 +15,9 @@
# #
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := slider TARGET_BOOTLOADER_BOARD_NAME := slider
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
TARGET_SCREEN_DENSITY := 560 TARGET_SCREEN_DENSITY := 560
USES_DEVICE_GOOGLE_RAVIOLE := true USES_DEVICE_GOOGLE_RAVIOLE := true

20
slider_generic.mk Normal file
View file

@ -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

View file

@ -607,38 +607,6 @@
"Multiplier":1, "Multiplier":1,
"Hidden":true "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", "Name":"TPU",
"Type":"NPU", "Type":"NPU",

View file

@ -597,38 +597,6 @@
"Multiplier":1, "Multiplier":1,
"Hidden":true "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", "Name":"TPU",
"Type":"NPU", "Type":"NPU",

View file

@ -257,70 +257,6 @@
"Multiplier":0.001, "Multiplier":0.001,
"Monitor":false "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", "Name":"TPU",
"Type":"NPU", "Type":"NPU",

View file

@ -257,70 +257,6 @@
"Multiplier":0.001, "Multiplier":0.001,
"Monitor":false "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", "Name":"TPU",
"Type":"NPU", "Type":"NPU",

View file

@ -15,13 +15,9 @@
# #
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := whitefin TARGET_BOOTLOADER_BOARD_NAME := whitefin
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
TARGET_SCREEN_DENSITY := 440 TARGET_SCREEN_DENSITY := 440
USES_DEVICE_GOOGLE_RAVIOLE := true USES_DEVICE_GOOGLE_RAVIOLE := true

20
whitefin_generic.mk Normal file
View file

@ -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