Improvement to artifact delivery method

A target can define a delivery directory instead of the default option

Author: Oren Cohen

tools/config/__init__.py

@@ -49,6 +49,7 @@
 DELIVERY_OVERRIDES = set([
     "target.deliver_to_target",
     "target.deliver_artifacts",
+    "target.delivery_dir"
 ])
 ROM_OVERRIDES = set([
     # managed BL
@@ -600,8 +601,13 @@ def has_ram_regions(self):
 
     def deliver_into(self):
         if self.target.deliver_to_target:
-            label_dir = "TARGET_{}".format(self.target.deliver_to_target)
-            target_delivery_dir = join(DELIVERY_DIR, label_dir)
+            delivery_target = Target.get_target(self.target.deliver_to_target)
+            if hasattr(delivery_target, "delivery_dir"):
+                target_delivery_dir = delivery_target.delivery_dir
+            else:
+                label_dir = "TARGET_{}".format(self.target.deliver_to_target)
+                target_delivery_dir = join(DELIVERY_DIR, label_dir)
+
             if not exists(target_delivery_dir):
                 os.makedirs(target_delivery_dir)