From 3537c2ca7ebf31c1673b9ec2bb0c17b0406bbae0 Mon Sep 17 00:00:00 2001
From: surmeh01 <surabhi.mehta@arm.com>
Date: Fri, 18 May 2018 16:31:43 +0100
Subject: Release 18.05

---
 Android.bp | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 2ab497056a..1a2afb8c8f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10,6 +10,7 @@
 ////////////////////////////////////////////
 cc_library_static {
     name: "libarmnn",
+    proprietary: true,
     export_include_dirs: ["include",
                           "src/armnnUtils"],
     local_include_dirs: ["src/armnn"],
@@ -25,6 +26,7 @@ cc_library_static {
         "src/armnn/backends/ClWorkloads/ClBatchNormalizationFloat32Workload.cpp",
         "src/armnn/backends/ClWorkloads/ClConstantFloat32Workload.cpp",
         "src/armnn/backends/ClWorkloads/ClConstantUint8Workload.cpp",
+        "src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp",
         "src/armnn/backends/ClWorkloads/ClConvolution2dFloat32Workload.cpp",
         "src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp",
         "src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloat32Workload.cpp",
@@ -76,6 +78,7 @@ cc_library_static {
         "src/armnn/backends/NeonWorkloads/NeonSplitterFloat32Workload.cpp",
         "src/armnn/backends/NeonWorkloads/NeonSplitterUint8Workload.cpp",
         "src/armnn/backends/ClWorkloadFactory.cpp",
+        "src/armnn/backends/ClContextControl.cpp",
         "src/armnn/backends/CpuTensorHandle.cpp",
         "src/armnn/backends/RefWorkloadFactory.cpp",
         "src/armnn/backends/RefWorkloads/RefMergerUint8Workload.cpp",
@@ -124,6 +127,29 @@ cc_library_static {
         "src/armnn/backends/MemCopyWorkload.cpp",
         "src/armnn/backends/WorkloadData.cpp",
         "src/armnn/backends/WorkloadFactory.cpp",
+        "src/armnn/backends/AclBaseMemoryManager.cpp",
+        "src/armnn/layers/ActivationLayer.cpp",
+        "src/armnn/layers/AdditionLayer.cpp",
+        "src/armnn/layers/BatchNormalizationLayer.cpp",
+        "src/armnn/layers/ConstantLayer.cpp",
+        "src/armnn/layers/Convolution2dLayer.cpp",
+        "src/armnn/layers/DepthwiseConvolution2dLayer.cpp",
+        "src/armnn/layers/FakeQuantizationLayer.cpp",
+        "src/armnn/layers/FloorLayer.cpp",
+        "src/armnn/layers/FullyConnectedLayer.cpp",
+        "src/armnn/layers/InputLayer.cpp",
+        "src/armnn/layers/L2NormalizationLayer.cpp",
+        "src/armnn/layers/MemCopyLayer.cpp",
+        "src/armnn/layers/MergerLayer.cpp",
+        "src/armnn/layers/MultiplicationLayer.cpp",
+        "src/armnn/layers/NormalizationLayer.cpp",
+        "src/armnn/layers/OutputLayer.cpp",
+        "src/armnn/layers/PermuteLayer.cpp",
+        "src/armnn/layers/Pooling2dLayer.cpp",
+        "src/armnn/layers/ReshapeLayer.cpp",
+        "src/armnn/layers/ResizeBilinearLayer.cpp",
+        "src/armnn/layers/SoftmaxLayer.cpp",
+        "src/armnn/layers/SplitterLayer.cpp",
         "src/armnn/Descriptors.cpp",
         "src/armnn/Exceptions.cpp",
         "src/armnn/Graph.cpp",
@@ -132,7 +158,6 @@ cc_library_static {
         "src/armnn/SerializeLayerParameters.cpp",
         "src/armnn/InternalTypes.cpp",
         "src/armnn/Layer.cpp",
-        "src/armnn/Layers.cpp",
         "src/armnn/LoadedNetwork.cpp",
         "src/armnn/Network.cpp",
         "src/armnn/backends/OutputHandler.cpp",
@@ -151,6 +176,8 @@ cc_library_static {
         "libboost_log",
         "libboost_system",
         "libboost_thread"],
+    shared_libs: [
+        "liblog"],
     stl: "libc++",
     cppflags: [
         "-fexceptions",
-- 
cgit v1.2.1