From 1fc5312b16fffa9f3435f13e1cc1fe51d5fd7fd8 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 19 Jun 2025 02:37:57 +0300 Subject: [PATCH] lynx: Remove non-existent vendor includes Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27 --- device-lynx.mk | 15 --------------- lynx/BoardConfig.mk | 2 -- 2 files changed, 17 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index 811f995..b357856 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -19,13 +19,6 @@ TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_LYNX_VERSION) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_LYNX_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_LYNX_DIR)/kernel-headers -$(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk) -$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk) -$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/WallpapersLynx.mk) - DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay include device/google/lynx/audio/lynx/audio-tables.mk @@ -157,11 +150,6 @@ include device/google/lynx/bluetooth/qti_default.mk # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g7_trusty -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) - # Vibrator HAL $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 @@ -179,9 +167,6 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ vendor.audio.hapticgenerator.distortion.output.gain=0.29 -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts - # Location PRODUCT_COPY_FILES += \ device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index a57dda6..304df80 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -40,9 +40,7 @@ BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 include device/google/gs201/BoardConfig-common.mk --include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk include device/google/lynx/sepolicy/lynx-sepolicy.mk include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk