aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZingo Andersen <zingo.andersen@arm.com>2021-12-14 13:58:56 +0100
committerZingo Andersen <zingo.andersen@arm.com>2021-12-14 14:01:06 +0100
commite02562b0957b4c14739f608513d3c03050c19369 (patch)
treea60e50639dad45fac0a4968ee3579b9305a55ab0
parent37c3e508dcd767e8823c913f3f487d6b0bd03fb2 (diff)
downloadandroid-nn-driver-e02562b0957b4c14739f608513d3c03050c19369.tar.gz
Make it possible to add libs from armnn backends during linking for test
Change-Id: I95e6a3819ba99e41883f9d64a0bd6ce8706a7a4f Signed-off-by: Zingo Andersen <zingo.andersen@arm.com>
-rw-r--r--Android.mk12
-rw-r--r--test/Android.mk12
2 files changed, 16 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index d0f4493a..d7ee542a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -213,7 +213,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -349,7 +350,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -479,7 +481,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -611,7 +614,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
diff --git a/test/Android.mk b/test/Android.mk
index f185c61e..89999663 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -80,7 +80,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
libarmnn-driver@1.0
@@ -195,7 +196,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
libarmnn-driver@1.1
@@ -305,7 +307,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
libarmnn-driver@1.2
@@ -412,7 +415,8 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
libflatbuffers-framework \
- arm_compute_library
+ arm_compute_library \
+ $(ARMNN_BACKEND_STATIC_LIBRARIES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
libarmnn-driver@1.3