commit c965f3c9d39346fbd188ad5561dda446f56c6f5a
author David Beck <david.beck@arm.com> Fri Oct 12 17:23:16 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Mon Oct 22 17:25:39 2018 +0100
tree 40618b77ba34ff1bde899703cc28f6af4112facb
parent 3d1059c5b782c5014fe790194b7dd91d2df66c84

IVGCVSW-1998 : preparation for ArmNN separate backends

* to auto-register backend factories we need static global varibles
  to be initialized which only happens if not omitted by the linker
* the whole-library option makes sure we include the whole ArmnN library
  in the driver

!armnn:153399

Change-Id: Idd2fc67ecc848e1b9be75da0e3ceace9bfa0061d

Android.mk

diff --git a/Android.mk b/Android.mk
index f9d59c8..f62e49e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,13 +60,14 @@
 
 LOCAL_STATIC_LIBRARIES := \
         libneuralnetworks_common \
-        libarmnn \
         libboost_log \
         libboost_program_options \
         libboost_system \
         libboost_thread \
         armnn-arm_compute
 
+LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
+
 LOCAL_SHARED_LIBRARIES := \
         libbase \
         libhidlbase \
@@ -136,13 +137,14 @@
 
 LOCAL_STATIC_LIBRARIES := \
         libneuralnetworks_common \
-        libarmnn \
         libboost_log \
         libboost_program_options \
         libboost_system \
         libboost_thread \
         armnn-arm_compute
 
+LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
+
 LOCAL_SHARED_LIBRARIES := \
         libbase \
         libhidlbase \
@@ -192,13 +194,14 @@
 LOCAL_STATIC_LIBRARIES := \
         libarmnn-driver@1.0 \
         libneuralnetworks_common \
-        libarmnn \
         libboost_log \
         libboost_program_options \
         libboost_system \
         libboost_thread \
         armnn-arm_compute
 
+LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
+
 LOCAL_SHARED_LIBRARIES := \
         libbase \
         libhidlbase \
@@ -258,13 +261,14 @@
 LOCAL_STATIC_LIBRARIES := \
         libarmnn-driver@1.1 \
         libneuralnetworks_common \
-        libarmnn \
         libboost_log \
         libboost_program_options \
         libboost_system \
         libboost_thread \
         armnn-arm_compute
 
+LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
+
 LOCAL_SHARED_LIBRARIES := \
         libbase \
         libhidlbase \