beast: 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 7722fab775a1a17f4e04a952d4c82b032a494e3d..92ee7941b7299bd767c30eee8bfbdaca91cedd7e 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include device/amlogic/gx-common/BoardConfigCommon.mk
-
 DEVICE_PATH := device/google/beast
 
 ## Bootloader
@@ -28,3 +26,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/gx-common/BoardConfigCommon.mk

diff --git a/device.mk b/device.mk
index de965581b777ca100c7f3b55a4efad5c6d429868..05d3f72d193805cee3dd361eee3e0a4c5b4dd502 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -6,8 +6,6 @@
 
 $(call inherit-product, vendor/google/beast/beast-vendor.mk)
 
-$(call inherit-product, device/amlogic/gx-common/gx.mk)
-
 ## Bluetooth
 BOARD_HAVE_BLUETOOTH_RTK_TV := true
 include hardware/realtek/rtkbt/rtkbt.mk
@@ -26,3 +24,6 @@ DEVICE_PACKAGE_OVERLAYS += \
 
 ## Platform
 TARGET_AMLOGIC_SOC := gxl
+
+## Inherit from the common tree product makefile
+$(call inherit-product, device/amlogic/gx-common/gx.mk)