From 1f88630874fe346cd0cca8d8e38e0fb96cc1a3f4 Mon Sep 17 00:00:00 2001
From: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Date: Fri, 5 Apr 2019 13:37:19 +0100
Subject: IVGCVSW-2915 Add Merge Layer and no-op factory method

Change-Id: I54549671e0d3b207904cf9796a843eb2b0a631f7
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
---
 Android.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 85bd214379..6d5a0faa66 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,6 +108,7 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/MaximumLayer.cpp \
         src/armnn/layers/MeanLayer.cpp \
         src/armnn/layers/MemCopyLayer.cpp \
+        src/armnn/layers/MergeLayer.cpp \
         src/armnn/layers/MergerLayer.cpp \
         src/armnn/layers/MinimumLayer.cpp \
         src/armnn/layers/MultiplicationLayer.cpp \
-- 
cgit v1.2.1