From 8ec448aac5f758e21a165719abfd8fb91ca2701e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sat, 29 Apr 2023 09:28:41 +0000 Subject: [PATCH] Update SoC-specific Lyric config. Bug: 280124102 Test: presubmit Change-Id: Ia6baa649a546cf90fdf995b2a928638f05c5ec74 --- device.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/device.mk b/device.mk index 09894dfd..19aa78f4 100644 --- a/device.mk +++ b/device.mk @@ -550,19 +550,11 @@ else LOCAL_TARGET_PRODUCT := slider endif -$(call soong_config_set,google3a_config,soc,zuma) -$(call soong_config_set,google3a_config,gcam_awb,true) -$(call soong_config_set,google3a_config,ghawb_truetone,true) - -ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),) +# Lyric Camera HAL settings +include device/google/gs-common/camera/lyric.mk $(call soong_config_set,lyric,soc,zuma) -$(call soong_config_set,lyric,use_lyric_camera_hal,true) $(call soong_config_set,lyric,kernel_version,v515) -# lyric::tuning_product is set in device-specific makefiles, -# such as device/google/${DEVICE}/device-${DEVICE}.mk - -$(call soong_config_set,gch,hwl_library,lyric) -endif +$(call soong_config_set,google3a_config,soc,zuma) # WiFi PRODUCT_PACKAGES += \ @@ -942,8 +934,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) include device/google/gs-common/sensors/sensors.mk -$(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk) PRODUCT_COPY_FILES += \ device/google/zuma/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \