From 8c2257dcc7e2200854165081f9c59d4a38ccdbad Mon Sep 17 00:00:00 2001 From: Ahmad Rulim Date: Mon, 14 Nov 2022 08:56:04 +0700 Subject: veux: Nuke duplicated vendor include Signed-off-by: Ahmad Rulim --- device.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/device.mk b/device.mk index e781447..ca0f051 100644 --- a/device.mk +++ b/device.mk @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -# Inherit from vendor blobs -$(call inherit-product, vendor/xiaomi/veux/veux-vendor.mk) - # Installs gsi keys into ramdisk, to boot a developer GSI with verified boot. $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk) @@ -16,6 +13,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) # Enable virtual A/B OTA $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk) +# Get non-open-source specific aspects +$(call inherit-product, vendor/xiaomi/veux/veux-vendor.mk) + # A/B AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ @@ -531,6 +531,3 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(call find-copy-subdir-files,*,$(LOCAL_PATH)/wifi/,$(TARGET_COPY_OUT_VENDOR)/etc/wifi) - -# Inherit the proprietary files -include vendor/xiaomi/veux/veux-vendor.mk -- cgit v1.2.3