wade: Shuffle proprietary makefiles inclusion

Change-Id: I5e2e3d51aeb440a7119ddba8b72b23b08509bf24

diff --git a/BoardConfig.mk b/BoardConfig.mk
index cb48d221ee6a78a3967736c193fe6d63ee43ce89..430d7454922a98fbd60282bc3fb5576d2d2a70a3 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include vendor/askey/wade/BoardConfigVendor.mk
-
 DEVICE_PATH := device/askey/wade
 
 ## Bluetooth
@@ -36,3 +34,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/wade/BoardConfigVendor.mk

diff --git a/device.mk b/device.mk
index de19050062ed8b7f7601256859b83a98553c744b..4c4a3077196635646755aa0296850dcdea0440b0 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, vendor/askey/wade/wade-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/wade/wade-vendor.mk)