From 686598b11680e91dd61e63e04413768e581662c4 Mon Sep 17 00:00:00 2001 From: chenkris Date: Thu, 8 Jun 2023 09:59:13 +0000 Subject: [PATCH] Move goodix mk files from device/google/gs101 to vendor/goodix/udfps Bug: 270657514 Test: build Change-Id: Ibeec835b439f0756a18295308ab70a4d4f29ecb6 --- device-oriole.mk | 11 ++++++----- device-raven.mk | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 5e83035..22e1801 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -28,21 +28,22 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/orio $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersOriole.mk) -GOODIX_CONFIG_BUILD_VERSION := g6_trusty DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay include device/google/raviole/audio/oriole/audio-tables.mk include device/google/gs101/device-shipping-common.mk -include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +# Fingerprint HAL +GOODIX_CONFIG_BUILD_VERSION := g6_trusty +include vendor/goodix/udfps/configuration/udfps_common.mk +ifeq ($(filter factory%, $(TARGET_PRODUCT)),) +include vendor/goodix/udfps/configuration/udfps_shipping.mk else -include device/google/gs101/fingerprint/udfps_factory.mk +include vendor/goodix/udfps/configuration/udfps_factory.mk endif # go/lyric-soong-variables diff --git a/device-raven.mk b/device-raven.mk index 1942212..649ed19 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -28,21 +28,21 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/rave $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/raven/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersRaven.mk) -GOODIX_CONFIG_BUILD_VERSION := g6_trusty DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay include device/google/raviole/audio/raven/audio-tables.mk include device/google/gs101/device-shipping-common.mk -include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk - -ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +# Fingerprint HAL +GOODIX_CONFIG_BUILD_VERSION := g6_trusty +include vendor/goodix/udfps/configuration/udfps_common.mk +ifeq ($(filter factory%, $(TARGET_PRODUCT)),) +include vendor/goodix/udfps/configuration/udfps_shipping.mk else -include device/google/gs101/fingerprint/udfps_factory.mk +include vendor/goodix/udfps/configuration/udfps_factory.mk endif ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)