Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update SoC-specific Lyric config." into udc-d1-dev am: accfa734ce

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22945399

Change-Id: I186c078c27fe391f2bff696ee49784becdef0889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Krzysztof Kosiński 2023-05-03 02:58:08 +00:00 • committed by Automerger Merge Worker
commit 1ba98d8586
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
device.mk
View file

@ -550,19 +550,11 @@ else
LOCAL_TARGET_PRODUCT := slider LOCAL_TARGET_PRODUCT := slider
endif endif
$(call soong_config_set,google3a_config,soc,zuma) # Lyric Camera HAL settings
$(call soong_config_set,google3a_config,gcam_awb,true) include device/google/gs-common/camera/lyric.mk
$(call soong_config_set,google3a_config,ghawb_truetone,true)
ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
$(call soong_config_set,lyric,soc,zuma) $(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) $(call soong_config_set,lyric,kernel_version,v515)
# lyric::tuning_product is set in device-specific makefiles, $(call soong_config_set,google3a_config,soc,zuma)
# such as device/google/${DEVICE}/device-${DEVICE}.mk
$(call soong_config_set,gch,hwl_library,lyric)
endif
# WiFi # WiFi
PRODUCT_PACKAGES += \ 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, vendor/google_devices/common/exynos-vendor.mk)
#$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
include device/google/gs-common/sensors/sensors.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 += \ PRODUCT_COPY_FILES += \
device/google/zuma/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ device/google/zuma/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \