sabrina: Shuffle proprietary makefiles inclusion

Change-Id: I5e2e3d51aeb440a7119ddba8b72b23b08509bf24

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 665fb2a12da2c87c22b49c624f5330ee391039f8..d68fd746eeb1f919f3e8079897352d1581fc7a9e 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include vendor/google/sabrina/BoardConfigVendor.mk
-
 DEVICE_PATH := device/google/sabrina
 
 ## Bluetooth
@@ -38,3 +36,6 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 ## Include the common tree BoardConfig makefile
 include device/amlogic/g12-common/BoardConfigCommon.mk
+
+## Include the proprietary BoardConfig makefile
+include vendor/google/sabrina/BoardConfigVendor.mk

diff --git a/device.mk b/device.mk
index 9d19ca2d24e03cf01cbe6ad297e509a604834f24..8ad2b0641b18b771d45a02d45bc226172c6fa3de 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, vendor/google/sabrina/sabrina-vendor.mk)
-
 ## Bluetooth
 PRODUCT_PACKAGES += \
     libbt-vendor
@@ -33,3 +31,6 @@ 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)
+
+## Inherit from the proprietary files makefile
+$(call inherit-product, vendor/google/sabrina/sabrina-vendor.mk)