Update oriole SVN to 40 am: 00838c077c am: 813c099409 am: 0433207040 am: 087106cd2d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/19911957
Change-Id: Iec9eacb9f67bddaa80dc216a266dcab60eb84cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index 8b2af59..e3f27d9 100644
--- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -68,4 +68,4 @@
<route type="mix" sink="BLE Speaker Out"
sources="le audio output"/>
</routes>
-</module>
\ No newline at end of file
+</module>
diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index 1437c49..908b6cd 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -32,7 +32,7 @@
property:persist.vendor.fingerprint.disable.fake.override=100
setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}
-service insmod_sh_raviole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
class main
user root
group root system
diff --git a/conf/init.slider.rc b/conf/init.slider.rc
index 3042b5b..af4a484 100644
--- a/conf/init.slider.rc
+++ b/conf/init.slider.rc
@@ -20,7 +20,7 @@
start insmod_sh_slider
-service insmod_sh_slider /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.slider.cfg
+service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg
class main
user root
group root system
diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc
index c030ad7..8894c75 100644
--- a/conf/init.whitefin.rc
+++ b/conf/init.whitefin.rc
@@ -14,7 +14,7 @@
wait_for_prop vendor.common.modules.ready 1
start insmod_sh_whitefin
-service insmod_sh_whitefin /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.whitefin.cfg
+service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg
class main
user root
group root system
diff --git a/device-oriole.mk b/device-oriole.mk
index f375829..20ec615 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -33,7 +33,7 @@
include device/google/gs101/fingerprint/udfps_common.mk
include device/google/gs101/telephony/pktrouter.mk
include hardware/google/pixel/vibrator/cs40l25/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),)
include device/google/gs101/fingerprint/udfps_shipping.mk
@@ -87,6 +87,20 @@
sar_test \
hci_inject
+# userdebug specific
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+# Bluetooth LE Audio Hardware offload
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.bluetooth.leaudio_offload.supported=true \
+ persist.bluetooth.leaudio_offload.disabled=true \
+ persist.bluetooth.le_audio_test=false
+endif
+
+# Bluetooth HAL
+PRODUCT_COPY_FILES += \
+ device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
+
+
# WirelessCharger
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
@@ -211,12 +225,6 @@
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true
-# Bluetooth HAL
-PRODUCT_PACKAGES += \
- bt_vendor.conf
-PRODUCT_COPY_FILES += \
- device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
-
# tetheroffload HAL
PRODUCT_PACKAGES += \
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
@@ -232,15 +240,6 @@
# This device is shipped with 31 (Android S)
PRODUCT_SHIPPING_API_LEVEL := 31
-# userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# Bluetooth LE Audio Hardware offload
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.bluetooth.leaudio_offload.supported=true \
- persist.bluetooth.leaudio_offload.disabled=true \
- persist.bluetooth.le_audio_test=false
-endif
-
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
@@ -252,16 +251,6 @@
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
-# Dolby integration
--include vendor/dolby/ds/dolby-buildspec.mk
-$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk)
-# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml
-PRODUCT_COPY_FILES := \
- device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
- $(PRODUCT_COPY_FILES)
-
-PRODUCT_RESTRICT_VENDOR_FILES := false
-
# Enable adpf cpu hint session for SurfaceFlinger
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true
diff --git a/device-raven.mk b/device-raven.mk
index 15ea022..588f964 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -32,7 +32,7 @@
include device/google/gs101/device-shipping-common.mk
include device/google/gs101/fingerprint/udfps_common.mk
include device/google/gs101/telephony/pktrouter.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
include device/google/gs101/fingerprint/udfps_shipping.mk
@@ -86,12 +86,24 @@
$(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
$(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+# Bluetooth HAL
+PRODUCT_COPY_FILES += \
+ device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
# Bluetooth Hal Extension test tools
PRODUCT_PACKAGES_DEBUG += \
sar_test \
hci_inject
+# userdebug specific
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+# Bluetooth LE Audio Hardware offload
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.bluetooth.leaudio_offload.supported=true \
+ persist.bluetooth.leaudio_offload.disabled=true \
+ persist.bluetooth.le_audio_test=false
+endif
+
# WirelessCharger
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
@@ -224,12 +236,6 @@
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true
-# Bluetooth HAL
-PRODUCT_PACKAGES += \
- bt_vendor.conf
-PRODUCT_COPY_FILES += \
- device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
-
# tetheroffload HAL
PRODUCT_PACKAGES += \
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
@@ -245,15 +251,6 @@
# This device is shipped with 31 (Android S)
PRODUCT_SHIPPING_API_LEVEL := 31
-# userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# Bluetooth LE Audio Hardware offload
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.bluetooth.leaudio_offload.supported=true \
- persist.bluetooth.leaudio_offload.disabled=true \
- persist.bluetooth.le_audio_test=false
-endif
-
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
@@ -265,16 +262,6 @@
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
-# Dolby integration
--include vendor/dolby/ds/dolby-buildspec.mk
-$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk)
-# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml
-PRODUCT_COPY_FILES := \
- device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
- $(PRODUCT_COPY_FILES)
-
-PRODUCT_RESTRICT_VENDOR_FILES := false
-
# Enable adpf cpu hint session for SurfaceFlinger
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true
diff --git a/device-slider.mk b/device-slider.mk
index a1662de..d40732b 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -27,7 +27,7 @@
include device/google/gs101/device-common.mk
include device/google/raviole/audio/slider/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l25/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
$(call soong_config_set,lyric,tuning_product,slider)
$(call soong_config_set,google3a_config,target_device,slider)
@@ -105,10 +105,6 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
-# Bluetooth HAL
-PRODUCT_PACKAGES += \
- bt_vendor.conf
-
# tetheroffload HAL
PRODUCT_PACKAGES += \
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
diff --git a/device-whitefin.mk b/device-whitefin.mk
index df3ce52..ccf467a 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -27,7 +27,7 @@
include device/google/gs101/device-common.mk
include hardware/google/pixel/vibrator/drv2624/device.mk
include device/google/raviole/audio/whitefin/audio-tables.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
$(call soong_config_set,lyric,tuning_product,slider)
$(call soong_config_set,google3a_config,target_device,slider)
@@ -84,10 +84,6 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
-# Bluetooth HAL
-PRODUCT_PACKAGES += \
- bt_vendor.conf
-
# tetheroffload HAL
PRODUCT_PACKAGES += \
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
diff --git a/media_codecs_dolby_c2.xml b/media_codecs_dolby_c2.xml
deleted file mode 100644
index e7ecfd9..0000000
--- a/media_codecs_dolby_c2.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2022 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.
--->
-<MediaCodecs>
- <Include href="media_codecs_aosp_c2.xml" />
- <Decoders>
- <MediaCodec name="c2.google.av1.decoder" type="video/av01">
- <Limit name="size" min="96x96" max="3840x2160" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="block-count" range="36-32400" />
- <Limit name="blocks-per-second" min="24" max="1944000" />
- <Limit name="bitrate" range="1-120000000" />
- <Limit name="frame-rate" range="1-180" />
- <Limit name="concurrent-instances" max="16" />
- <Limit name="performance-point-1280x720" value="180" />
- <Limit name="performance-point-1920x1080" value="120" />
- <Limit name="performance-point-3840x2160" value="60" />
- <Feature name="adaptive-playback" />
- <Feature name="can-swap-width-height" value="1" />
- </MediaCodec>
- <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
- <Limit name="size" min="96x96" max="3840x2160" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="block-count" range="36-32400" />
- <Limit name="blocks-per-second" min="24" max="1944000" />
- <Limit name="bitrate" range="1-120000000" />
- <Limit name="frame-rate" range="1-180" />
- <Limit name="concurrent-instances" max="16" />
- <Limit name="performance-point-1280x720" value="180" />
- <Limit name="performance-point-1920x1080" value="120" />
- <Limit name="performance-point-3840x2160" value="60" />
- <Feature name="adaptive-playback" />
- <Feature name="secure-playback" required="true" />
- <Feature name="can-swap-width-height" value="1" />
- </MediaCodec>
- <MediaCodec name="c2.dolby.eac3.decoder">
- <Type name="audio/ac3">
- <Alias name="OMX.dolby.ac3.decoder"/>
- <Limit name="channel-count" max="6"/>
- <Limit name="sample-rate" ranges="32000,44100,48000"/>
- <Limit name="bitrate" range="32000-640000"/>
- </Type>
- <Attribute name="software-codec"/>
- <Type name="audio/eac3">
- <Alias name="OMX.dolby.eac3.decoder"/>
- <Limit name="channel-count" max="8"/>
- <Limit name="sample-rate" ranges="32000,44100,48000"/>
- <Limit name="bitrate" range="32000-6144000"/>
- </Type>
- </MediaCodec>
- </Decoders>
-</MediaCodecs>
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index dc1db0c..8360d91 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -13,8 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-ifdef PHONE_CAR_BOARD_PRODUCT
- include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+ifdef AUTOMOTIVE_PRODUCT_PATH
+ #RBC# include_top device/google/auto_tcu
+ #RBC# include_top device/google/pixel_tcu
+ #RBC# include_top device/google_car
+ include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk
else
TARGET_SCREEN_DENSITY := 420
endif
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 6114e8a..148e2c2 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -131,15 +131,6 @@
"ResetOnInit": true
},
{
- "Name": "MIFTargetLoad",
- "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
- "Values": [
- "20 5 80",
- "20 10 80"
- ],
- "ResetOnInit": true
- },
- {
"Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
@@ -849,12 +840,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "TAPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -933,12 +918,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "TAPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1017,12 +996,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDHighCpusetCpus",
"Duration": 0,
"Value": "6-7"
@@ -1095,12 +1068,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDHighCpusetCpus",
"Duration": 0,
"Value": "6-7"
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 18d1324..7879ea3 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -130,15 +130,6 @@
"ResetOnInit": true
},
{
- "Name": "MIFTargetLoad",
- "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
- "Values": [
- "20 5 80",
- "20 10 80"
- ],
- "ResetOnInit": true
- },
- {
"Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
@@ -853,12 +844,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "TAPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -937,12 +922,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "TAPreferHighCap",
"Duration": 0,
"Value": "1"
@@ -1021,12 +1000,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDHighCpusetCpus",
"Duration": 0,
"Value": "6-7"
@@ -1099,12 +1072,6 @@
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "MIFTargetLoad",
- "Duration": 0,
- "Value": "20 10 80"
- },
- {
- "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDHighCpusetCpus",
"Duration": 0,
"Value": "6-7"
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index b78d5b4..0247901 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -14,8 +14,11 @@
# limitations under the License.
#
-ifdef PHONE_CAR_BOARD_PRODUCT
- include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+ifdef AUTOMOTIVE_PRODUCT_PATH
+ #RBC# include_top device/google/auto_tcu
+ #RBC# include_top device/google/pixel_tcu
+ #RBC# include_top device/google_car
+ include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk
else
TARGET_SCREEN_DENSITY := 560
endif