dopinder: Inherit common tree after device vars are set

* Allows several variables to be read in common tree.

Change-Id: Ic8f3a4d210568254d814b013b67d8f06efff5e63

diff --git a/BoardConfig.mk b/BoardConfig.mk
index f6da64a4cf0b1cddd4c59bf78cc6150239a987ec..db77eb2eb177fa39becbdf4f7c2e465d3f55316b 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,11 +1,9 @@
 #
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2022 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include device/amlogic/g12-common/BoardConfigCommon.mk
-
 DEVICE_PATH := device/askey/dopinder
 
 ## Bootloader
@@ -25,3 +23,6 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_rtl
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_rtl
 WIFI_DRIVER_SOCKET_IFACE := wlan0
 PRODUCT_CFI_INCLUDE_PATHS += hardware/realtek/wlan/wpa_supplicant_8_lib
+
+## Include the common tree BoardConfig makefile
+include device/amlogic/g12-common/BoardConfigCommon.mk

diff --git a/device.mk b/device.mk
index d58632cbff79ee27214c58a3c595222d4b8b8a18..59b54a15f9dee47db8c52130a78ddc033c7ad056 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -6,8 +6,6 @@
 
 $(call inherit-product, vendor/askey/dopinder/dopinder-vendor.mk)
 
-$(call inherit-product, device/amlogic/g12-common/g12.mk)
-
 ## Bluetooth
 BOARD_HAVE_BLUETOOTH_RTK_TV := true
 include hardware/realtek/rtkbt/rtkbt.mk
@@ -23,3 +21,6 @@ PRODUCT_PACKAGES += \
 ## Overlays
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay
+
+## Inherit from the common tree product makefile
+$(call inherit-product, device/amlogic/g12-common/g12.mk)