diff --git a/audio/lynx/config/mixer_paths.xml b/audio/lynx/config/mixer_paths.xml index e3db0cb..d5b41ac 100644 --- a/audio/lynx/config/mixer_paths.xml +++ b/audio/lynx/config/mixer_paths.xml @@ -33,8 +33,10 @@ + + @@ -44,6 +46,10 @@ + + + + @@ -67,8 +73,8 @@ - - + + @@ -77,8 +83,8 @@ - - + + diff --git a/audio/lynx/config/mixer_paths_factory.xml b/audio/lynx/config/mixer_paths_factory.xml index 4e551f2..df1c19c 100644 --- a/audio/lynx/config/mixer_paths_factory.xml +++ b/audio/lynx/config/mixer_paths_factory.xml @@ -17,8 +17,6 @@ - - @@ -111,7 +109,7 @@ - + @@ -275,6 +273,13 @@ + + + + + + + diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml index d733c24..d9a378e 100644 --- a/bluetooth/manifest_bluetooth.xml +++ b/bluetooth/manifest_bluetooth.xml @@ -2,7 +2,7 @@ android.hardware.bluetooth hwbinder - 1.0 + 1.1 IBluetoothHci default diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk new file mode 100644 index 0000000..5adef0b --- /dev/null +++ b/bluetooth/qti_default.mk @@ -0,0 +1,57 @@ +# +# Copyright (C) 2021 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. +# + +# Bluetooth HAL and Pixel extension +DEVICE_MANIFEST_FILE += \ + device/google/lynx/bluetooth/manifest_bluetooth.xml + +BOARD_SEPOLICY_DIRS += device/google/lynx-sepolicy/bluetooth + +BOARD_HAVE_BLUETOOTH_QCOM = true +BOARD_USES_COMMON_BLUETOOTH_HAL = true +QCOM_BLUETOOTH_USING_DIAG = false +TARGET_BLUETOOTH_HCI_V1_1 = true +TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18" +UART_USE_TERMIOS_AFC = true +TARGET_USE_QTI_BT_IBS = false +TARGET_USE_QTI_BT_OBS = true +TARGET_USE_QTI_BT_SAR = true +TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true +ifeq ($(TARGET_BLUETOOTH_HCI_V1_1),true) + PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-impl-qti +else + PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-impl-qti +endif +PRODUCT_PACKAGES += \ + android.hardware.bluetooth@1.0-service-qti \ + hardware.google.bluetooth.sar@1.0-impl \ + hardware.google.bluetooth.bt_channel_avoidance@1.0-impl + +# Bluetooth SAR test tools +PRODUCT_PACKAGES_DEBUG += \ + bluetooth_sar_test + +# Bluetooth SoC, BDA in device tree, and WiPower +PRODUCT_PROPERTY_OVERRIDES += \ + vendor.qcom.bluetooth.soc=hastings \ + ro.vendor.bt.bdaddr_path=/proc/device-tree/chosen/config/bt_addr \ + ro.vendor.bluetooth.emb_wp_mode=false \ + ro.vendor.bluetooth.wipower=false + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.bluetooth.a2dp_offload.supported=true \ + persist.bluetooth.a2dp_offload.disabled=true \ + persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac diff --git a/device-lynx.mk b/device-lynx.mk index 59812b6..f300f0d 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -25,10 +25,9 @@ $(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/de include device/google/gs201/device-shipping-common.mk include device/google/lynx/audio/lynx/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk -SOONG_CONFIG_lyric_tuning_product := cloudripper -SOONG_CONFIG_google3a_config_target_device := cloudripper +$(call soong_config_set,lyric,tuning_product,cloudripper) +$(call soong_config_set,google3a_config,target_device,cloudripper) # Init files PRODUCT_COPY_FILES += \ @@ -81,16 +80,8 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_COPY_FILES += \ device/google/lynx/thermal_info_config_lynx.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json -# Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/lynx/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth -PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ - bt_vendor.conf -PRODUCT_COPY_FILES += \ - device/google/lynx/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf +# Bluetooth HAL and Pixel extension +include device/google/lynx/bluetooth/qti_default.mk # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -122,10 +113,6 @@ PRODUCT_COPY_FILES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty include device/google/gs101/fingerprint/udfps_common.mk @@ -141,3 +128,16 @@ PRODUCT_VENDOR_PROPERTIES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts + +# GPS xml +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/lynx/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/lynx/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + +# DCK properties based on target +PRODUCT_PROPERTY_OVERRIDES += \ + ro.gms.dck.eligible_wcc=2 diff --git a/factory_lynx.mk b/factory_lynx.mk index 1387c1a..b456ceb 100644 --- a/factory_lynx.mk +++ b/factory_lynx.mk @@ -31,7 +31,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Factory binaries of camera -PRODUCT_PACKAGES += fatp_c10p10_wide_hat_tool +PRODUCT_PACKAGES += fatp_imx787_hat_tool # Factory binaries of wifi PRODUCT_PACKAGES += myftm diff --git a/gps.xml.l10 b/gps.xml.l10 new file mode 100644 index 0000000..a6bbcfc --- /dev/null +++ b/gps.xml.l10 @@ -0,0 +1,86 @@ + + + + + + + + + + diff --git a/gps_user.xml.l10 b/gps_user.xml.l10 new file mode 100644 index 0000000..686d7dd --- /dev/null +++ b/gps_user.xml.l10 @@ -0,0 +1,86 @@ + + + + + + + + + + + diff --git a/manifest.xml b/manifest.xml index 66b69a6..519e852 100644 --- a/manifest.xml +++ b/manifest.xml @@ -170,7 +170,7 @@ vendor.google.google_battery hwbinder - 1.1 + 1.2 IGoogleBattery default diff --git a/powerstats/Android.bp b/powerstats/Android.bp index 9e865b9..2a38f9f 100644 --- a/powerstats/Android.bp +++ b/powerstats/Android.bp @@ -15,7 +15,7 @@ soong_namespace { imports: [ "hardware/google/pixel", - "device/google/gs201", + "device/google/gs201/powerstats", ] } diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlay/Android.bp new file mode 100644 index 0000000..a79cb93 --- /dev/null +++ b/rro_overlays/WifiOverlay/Android.bp @@ -0,0 +1,18 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "//device/google/lynx:device_google_lynx_license"" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "//device/google/lynx:device_google_lynx_license", + ], +} + +runtime_resource_overlay { + name: "WifiOverlay2023Mid", + theme: "WifiOverlay2023Mid", + certificate: "platform", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlay/AndroidManifest.xml new file mode 100644 index 0000000..e59eb88 --- /dev/null +++ b/rro_overlays/WifiOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/rro_overlays/WifiOverlay/OWNERS b/rro_overlays/WifiOverlay/OWNERS new file mode 100644 index 0000000..0fa24cf --- /dev/null +++ b/rro_overlays/WifiOverlay/OWNERS @@ -0,0 +1,3 @@ +# People who can approve changes for submission +kumachang@google.com +hsuvictor@google.com diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml new file mode 100644 index 0000000..070422c --- /dev/null +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -0,0 +1,138 @@ + + + + + + true + + + true + + + true + + + true + + + -77 + -80 + + -80 + -83 + + + false + + + true + + + 524288,2097152,8388608,262144,524288,4194304 + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + Pixel + + + 32 + + + + 1 + 256 + 257 + 258 + 259 + 260 + 261 + 262 + 263 + 264 + 512 + 513 + 514 + + + + 3000 + + + 10 + + + true + + + true + + + true + + + true + + + true + + + false + + + true + + + true + + + true + + + true +