odroidc4: 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 6cc9587b0e1cab047413f841b99899a6a0e5ff72..da3361883c2e2697fefd96f7a6f9f91114eccb3a 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/hardkernel/odroidc4
 
 ## Bootloader
@@ -16,3 +14,6 @@ TARGET_DTB_NAME := sm1_s905y3_odroidc4
 
 ## Properties
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
+
+## Include the common tree BoardConfig makefile
+include device/amlogic/g12-common/BoardConfigCommon.mk

diff --git a/device.mk b/device.mk
index 67131b1f2e19c12d47fbe3dd91ed8753fcfe9048..7fbc00a109a8b2264b5a07e8375d9da662fb1686 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -1,11 +1,12 @@
 #
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2022 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, device/amlogic/g12-common/g12.mk)
-
 ## Factory
 PRODUCT_HOST_PACKAGES += \
     aml_image_packer
+
+## Inherit from the common tree product makefile
+$(call inherit-product, device/amlogic/g12-common/g12.mk)