commit beb3e1f460012f98921fc88488b6349f95c6e1d5
author David Beck <david.beck@arm.com> Mon Oct 15 14:15:42 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Mon Oct 22 17:25:39 2018 +0100
tree c10a7a804918663240f9bb3e6429bf37af5482bd
parent a893efa3494121f910058ae5b75e32bf6c1d5720

IVGCVSW-1998 : fix for missing initialization in the driver

Change-Id: I5b1209a871d0a848bb1fdfba5228f181e6968004

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index c38b92e..0e9824f 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -57,15 +57,16 @@
         TestTensor.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-        libarmnn-driver@1.0 \
         libneuralnetworks_common \
-        libarmnn \
         libboost_log \
         libboost_system \
         libboost_unit_test_framework \
         libboost_thread \
         armnn-arm_compute
 
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+        libarmnn-driver@1.0
+
 LOCAL_SHARED_LIBRARIES := \
         libbase \
         libhidlbase \
@@ -132,15 +133,16 @@
         TestTensor.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-        libarmnn-driver@1.1 \
         libneuralnetworks_common \
-        libarmnn \
         libboost_log \
         libboost_system \
         libboost_unit_test_framework \
         libboost_thread \
         armnn-arm_compute
 
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+        libarmnn-driver@1.1
+
 LOCAL_SHARED_LIBRARIES := \
         libbase \
         libhidlbase \