From 107f40f10870f7d3fc12edc36e95b8dd102bfdf7 Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Thu, 19 Mar 2020 20:53:06 -0400
Subject: [PATCH] extra: Refactor product image handling

---
 BoardConfigExtra.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/BoardConfigExtra.mk b/BoardConfigExtra.mk
index 8879707..311aa95 100644
--- a/BoardConfigExtra.mk
+++ b/BoardConfigExtra.mk
@@ -4,7 +4,11 @@ ifneq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
 endif
 
 # Product
-TARGET_COPY_OUT_PRODUCT := system/product
+ifneq ($(filter %bonito %sargo %gts4lvwifi %crosshatch %blueline %flame %coral,$(TARGET_PRODUCT)),)
+    TARGET_COPY_OUT_PRODUCT := product
+else
+    TARGET_COPY_OUT_PRODUCT := system/product
+endif
 
 ## Signing
 #ifeq ($(BOARD_AVB_ENABLE),true)