From 6bd61eea9f53d951472b26afb347dfb23501cf1c Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Wed, 8 Jun 2022 22:35:35 -0400
Subject: [PATCH] sabrina: Inherit common tree after device vars are set

* Allows several variables to be read in common tree.

Change-Id: Ic8f3a4d210568254d814b013b67d8f06efff5e63
---
 BoardConfig.mk | 7 ++++---
 device.mk      | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index de6fb7e..665fb2a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,13 +1,11 @@
 #
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2022 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
 include vendor/google/sabrina/BoardConfigVendor.mk
 
-include device/amlogic/g12-common/BoardConfigCommon.mk
-
 DEVICE_PATH := device/google/sabrina
 
 ## Bluetooth
@@ -37,3 +35,6 @@ WIFI_DRIVER_FW_PATH_AP := "/vendor/etc/wifi/buildin/fw_fw_bcm4356a2_ag_apsta.bin
 WIFI_DRIVER_FW_PATH_STA := "/vendor/etc/wifi/buildin/fw_bcm4356a2_ag.bin"
 WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path"
 WPA_SUPPLICANT_VERSION := VER_0_8_X
+
+## Include the common tree BoardConfig makefile
+include device/amlogic/g12-common/BoardConfigCommon.mk
diff --git a/device.mk b/device.mk
index e6a7770..9d19ca2 100644
--- a/device.mk
+++ b/device.mk
@@ -6,8 +6,6 @@
 
 $(call inherit-product, vendor/google/sabrina/sabrina-vendor.mk)
 
-$(call inherit-product, device/amlogic/g12-common/g12.mk)
-
 ## Bluetooth
 PRODUCT_PACKAGES += \
     libbt-vendor
@@ -30,4 +28,8 @@ DEVICE_PACKAGE_OVERLAYS += \
 ## Wi-Fi
 TARGET_DHD_VERSION := bcmdhd.100.10.545.x
 
+## Wi-Fi Firmware
 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)
-- 
2.20.1