beast: Shuffle proprietary makefiles inclusion

Change-Id: I5e2e3d51aeb440a7119ddba8b72b23b08509bf24

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 92ee7941b7299bd767c30eee8bfbdaca91cedd7e..23b65f5f1e6e0ea61cb508f8551c0a89963fe4c2 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -29,3 +29,6 @@ PRODUCT_CFI_INCLUDE_PATHS += hardware/realtek/wlan/wpa_supplicant_8_lib
 
 ## Include the common tree BoardConfig makefile
 include device/amlogic/gx-common/BoardConfigCommon.mk
+
+## Include the proprietary BoardConfig makefile
+include vendor/google/beast/BoardConfigVendor.mk

diff --git a/device.mk b/device.mk
index 05d3f72d193805cee3dd361eee3e0a4c5b4dd502..8ce994b348cd312529be5272b4b40d8a3ef40a48 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, vendor/google/beast/beast-vendor.mk)
-
 ## Bluetooth
 BOARD_HAVE_BLUETOOTH_RTK_TV := true
 include hardware/realtek/rtkbt/rtkbt.mk
@@ -27,3 +25,6 @@ TARGET_AMLOGIC_SOC := gxl
 
 ## Inherit from the common tree product makefile
 $(call inherit-product, device/amlogic/gx-common/gx.mk)
+
+## Inherit from the proprietary files makefile
+$(call inherit-product, vendor/google/beast/beast-vendor.mk)