1 files changed, 8 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index f9d59c83..f62e49e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,13 +60,14 @@ LOCAL_SRC_FILES := \
 
 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_SRC_FILES := \
 
 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_SRC_FILES := \
 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_SRC_FILES := \
 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 \