From e162d69f56ac7232976026dc091b86357b376a32 Mon Sep 17 00:00:00 2001
From: Oren Cohen <oren.cohen@arm.com>
Date: Thu, 7 Feb 2019 19:13:01 +0200
Subject: [PATCH] Make delivery_dir relative to the json it was declared in

---
 tools/config/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index 4a48d843d9..6a1dd8f90c 100644
--- a/tools/config/__init__.py
+++ b/tools/config/__init__.py
@@ -44,7 +44,8 @@ try:
 except NameError:
     unicode = str
 PATH_OVERRIDES = set([
-    "target.bootloader_img"
+    "target.bootloader_img",
+    "target.delivery_dir"
 ])
 DELIVERY_OVERRIDES = set([
     "target.deliver_to_target",
@@ -601,9 +602,8 @@ class Config(object):
 
     def deliver_into(self):
         if self.target.deliver_to_target:
-            delivery_target = Target.get_target(self.target.deliver_to_target)
-            if hasattr(delivery_target, "delivery_dir"):
-                target_delivery_dir = join(ROOT, delivery_target.delivery_dir)
+            if self.target.delivery_dir:
+                target_delivery_dir = self.target.delivery_dir
             else:
                 label_dir = "TARGET_{}".format(self.target.deliver_to_target)
                 target_delivery_dir = join(DELIVERY_DIR, label_dir)