From 5d9ff8cba8bb249723d78442d9e1aff1a6b2358a Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 9 Jun 2022 20:16:12 +0100 Subject: [PATCH] deadpool: Shuffle proprietary makefiles inclusion Change-Id: I5e2e3d51aeb440a7119ddba8b72b23b08509bf24 --- BoardConfig.mk | 5 +++-- device.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index e3482fd..3b0c1fe 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -include vendor/askey/deadpool/BoardConfigVendor.mk - DEVICE_PATH := device/askey/deadpool ## Bluetooth @@ -35,3 +33,6 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X ## Include the common tree BoardConfig makefile include device/amlogic/g12-common/BoardConfigCommon.mk + +## Include the proprietary BoardConfig makefile +include vendor/askey/deadpool/BoardConfigVendor.mk diff --git a/device.mk b/device.mk index 44aeb60..dcbaa9c 100644 --- a/device.mk +++ b/device.mk @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -$(call inherit-product, vendor/askey/deadpool/deadpool-vendor.mk) - ## Bluetooth PRODUCT_PACKAGES += \ libbt-vendor @@ -27,3 +25,6 @@ include hardware/amlogic/kernel-modules/dhd-driver/firmware/firmware.mk ## Inherit from the common tree product makefile $(call inherit-product, device/amlogic/g12-common/g12.mk) + +## Inherit from the proprietary files makefile +$(call inherit-product, vendor/askey/deadpool/deadpool-vendor.mk) -- 2.20.1