From 80fb3cf2e70fd6745e9567ecf8cecaf89a082ec6 Mon Sep 17 00:00:00 2001
From: Adam Pigg <adam@piggz.co.uk>
Date: Thu, 30 Jul 2020 18:38:01 +0100
Subject: [PATCH] [hybris-boot] Add support for using fixup-mountpoint from dcd

Following the hadk, the droid-configs folder for device specific
configuration will also reside in the hybris folder.  Having
fixup-mountpoint-$DEVICE in that folder will allow ports to contain all
device configuration without having to push changes up to the main
hybris-boot repository just for purpose of creating the initrd.

Change-Id: Ibc3cd7322ed916ebdd58ff1044659c491751a3f8
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index d4cc2fa..7723b0b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,8 @@ HYBRIS_R_ALWAYSDEBUG := 1
 
 # Force deferred assignment
 
-HYBRIS_FIXUP_MOUNTS := $(shell ls -1 $(LOCAL_PATH)/../fixup-mountpoints $(LOCAL_PATH)/fixup-mountpoints 2> /dev/null | head -n1)
+HYBRIS_FIXUP_MOUNTS := $(shell ls -1 $(LOCAL_PATH)/../fixup-mountpoints $(LOCAL_PATH)/../droid-configs/fixup-mountpoints-$(TARGET_DEVICE) $(LOCAL_PATH)/fixup-mountpoints 2> /dev/null | head -n1)
+$(info Found fixup mountpoint at $(HYBRIS_FIXUP_MOUNTS))
 
 
 # Find any fstab files for required partition information.