From c92de35241f768ad104e4bd2bb487e7620f1f038 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 9 Jun 2022 20:16:12 +0100 Subject: [PATCH] beast: Shuffle proprietary makefiles inclusion Change-Id: I5e2e3d51aeb440a7119ddba8b72b23b08509bf24 --- BoardConfig.mk | 3 +++ device.mk | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 92ee794..23b65f5 100644 --- 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 05d3f72..8ce994b 100644 --- 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) -- 2.20.1