commit 1f88630874fe346cd0cca8d8e38e0fb96cc1a3f4
author Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> Fri Apr 05 13:37:19 2019 +0100
committer Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> Fri Apr 05 13:37:29 2019 +0100
tree 41acf0281797c5d4e9e515032ac989428efcb5b8
parent 647aab364aa13490427533c427496ad725b47f7a

IVGCVSW-2915 Add Merge Layer and no-op factory method

Change-Id: I54549671e0d3b207904cf9796a843eb2b0a631f7
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 85bd214..6d5a0fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,6 +108,7 @@
         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 \