dopinder: Shuffle proprietary makefiles inclusion

Change-Id: I5e2e3d51aeb440a7119ddba8b72b23b08509bf24

diff --git a/BoardConfig.mk b/BoardConfig.mk
index db77eb2eb177fa39becbdf4f7c2e465d3f55316b..e8dab30f5c9b1fdeb8e9e73bc4b58146ef8ab030 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -26,3 +26,6 @@ PRODUCT_CFI_INCLUDE_PATHS += hardware/realtek/wlan/wpa_supplicant_8_lib
 
 ## Include the common tree BoardConfig makefile
 include device/amlogic/g12-common/BoardConfigCommon.mk
+
+## Include the proprietary BoardConfig makefile
+include vendor/askey/dopinder/BoardConfigVendor.mk

diff --git a/device.mk b/device.mk
index 59b54a15f9dee47db8c52130a78ddc033c7ad056..6e7bd09bff129616d550867608c7c9e85d6aec32 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, vendor/askey/dopinder/dopinder-vendor.mk)
-
 ## Bluetooth
 BOARD_HAVE_BLUETOOTH_RTK_TV := true
 include hardware/realtek/rtkbt/rtkbt.mk
@@ -24,3 +22,6 @@ DEVICE_PACKAGE_OVERLAYS += \
 
 ## 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/dopinder/dopinder-vendor.mk)