diff options
Diffstat (limited to 'device-shiba.mk')
| -rw-r--r-- | device-shiba.mk | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/device-shiba.mk b/device-shiba.mk index 333b9d5..b527ac6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -14,8 +14,11 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/shusky-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/shusky-kernel/kernel-headers +TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers LOCAL_PATH := device/google/shusky @@ -27,18 +30,15 @@ $(call inherit-product-if-exists, vendor/google_devices/shiba/proprietary/device $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk) DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay +CAMERA_PRODUCT ?= shiba include device/google/shusky/audio/shiba/audio-tables.mk +include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/gti.mk -# go/lyric-soong-variables -$(call soong_config_set,lyric,camera_hardware,shiba) -$(call soong_config_set,lyric,tuning_product,shiba) -$(call soong_config_set,google3a_config,target_device,shiba) - # Init files PRODUCT_COPY_FILES += \ device/google/shusky/conf/init.shiba.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.shiba.rc @@ -54,8 +54,6 @@ PRODUCT_COPY_FILES += \ device/google/shusky/shiba/radio/shiba_display_primary_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv # Camera -PRODUCT_COPY_FILES += \ - device/google/shusky/media_profiles_shiba.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.rls_range_supported=false @@ -70,7 +68,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st @@ -187,14 +185,18 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true -# Not support LE Audio dual mic SWB call based on the current launch strategy +# Support LE Audio dual mic SWB call PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.leaudio.dual_bidirection_swb.supported=false + bluetooth.leaudio.dual_bidirection_swb.supported=true # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ @@ -242,6 +244,11 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk +endif # Location # SDK build system @@ -268,12 +275,17 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 +else +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk +endif GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include device/google/gs101/fingerprint/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # Fingerprint exposure compensation @@ -281,7 +293,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.auto_exposure_compensation_supported=true # Display -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # lhbm peak brightness delay: decided by kernel PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=0 @@ -306,7 +318,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true # Media Performance Class 14 -PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=33 +PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 @@ -315,7 +327,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=0 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.187 \ ro.vendor.vibrator.hal.loc.coeff=2.75 \ persist.vendor.vibrator.hal.context.enable=false \ @@ -377,10 +389,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true +# AVF assignable devices xml +PRODUCT_PACKAGES += shusky_assignable_devices.xml + # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true -# DisplayPort should be disabled by default (b/300167292) -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.usb.displayport.enabled=0 +PRODUCT_PACKAGES += \ + NfcOverlayShiba |