Remove references to removed files and variables.
Camera driver config was moved to device/google/gs-common. Bug: 280124102 Test: presubmit Change-Id: Id2c60680c9eb277c198c7ec46d0be1062339ad44
This commit is contained in:
parent
1c5f1e6632
commit
751069c1b4
1 changed files with 1 additions and 12 deletions
13
device.mk
13
device.mk
|
@ -548,24 +548,15 @@ else
|
||||||
LOCAL_TARGET_PRODUCT := slider
|
LOCAL_TARGET_PRODUCT := slider
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# TODO(b/272725898): Needs to check with owner later
|
include device/google/gs-common/camera/lyric.mk
|
||||||
$(warning google3a_config set to zuma on zumapro target)
|
|
||||||
$(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),)
|
|
||||||
# TODO(b/272725898): Needs to check with owner later
|
# TODO(b/272725898): Needs to check with owner later
|
||||||
$(warning lyric set to zuma on zumapro target)
|
$(warning lyric set to zuma on zumapro target)
|
||||||
$(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,
|
# lyric::tuning_product is set in device-specific makefiles,
|
||||||
# such as device/google/${DEVICE}/device-${DEVICE}.mk
|
# such as device/google/${DEVICE}/device-${DEVICE}.mk
|
||||||
|
|
||||||
$(call soong_config_set,gch,hwl_library,lyric)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# WiFi
|
# WiFi
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.wifi-service \
|
android.hardware.wifi-service \
|
||||||
|
@ -953,8 +944,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/zumapro/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
|
device/google/zumapro/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue