From 931297bd185758d3bbefd79db2bb7721f2679ecf Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Wed, 8 Jun 2022 22:41:02 -0400 Subject: [PATCH] odroidc4: 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 | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 6cc9587..da33618 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,11 +1,9 @@ # -# Copyright (C) 2021 The LineageOS Project +# Copyright (C) 2021-2022 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # -include device/amlogic/g12-common/BoardConfigCommon.mk - DEVICE_PATH := device/hardkernel/odroidc4 ## Bootloader @@ -16,3 +14,6 @@ TARGET_DTB_NAME := sm1_s905y3_odroidc4 ## Properties TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop + +## Include the common tree BoardConfig makefile +include device/amlogic/g12-common/BoardConfigCommon.mk diff --git a/device.mk b/device.mk index 67131b1..7fbc00a 100644 --- a/device.mk +++ b/device.mk @@ -1,11 +1,12 @@ # -# Copyright (C) 2021 The LineageOS Project +# Copyright (C) 2021-2022 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # -$(call inherit-product, device/amlogic/g12-common/g12.mk) - ## Factory PRODUCT_HOST_PACKAGES += \ aml_image_packer + +## Inherit from the common tree product makefile +$(call inherit-product, device/amlogic/g12-common/g12.mk) -- 2.20.1