Merge "Update SoC-specific Lyric config." into udc-d1-dev
This commit is contained in:
commit
accfa734ce
1 changed files with 3 additions and 13 deletions
16
device.mk
16
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 \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue