deadpool: Shuffle proprietary makefiles inclusion

Change-Id: I5e2e3d51aeb440a7119ddba8b72b23b08509bf24

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e3482fdff20f5792a5ebb8e151b9d148c5bc1a14..3b0c1fe59951b3822dd6ff6369e5d49254ea252f 100644 (file)
--- 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 44aeb6088ecc96b8b052f293a2b808f0c9c286b1..dcbaa9cecdf9bd56dab7e87b42cfba45868bb26d 100644 (file)
--- 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)