diff options
| author | David Beck <david.beck@arm.com> | 2018-10-15 14:15:42 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 17:25:39 +0100 |
| commit | beb3e1f460012f98921fc88488b6349f95c6e1d5 (patch) | |
| tree | c10a7a804918663240f9bb3e6429bf37af5482bd | |
| parent | a893efa3494121f910058ae5b75e32bf6c1d5720 (diff) | |
| download | android-nn-driver-beb3e1f460012f98921fc88488b6349f95c6e1d5.tar.gz | |
IVGCVSW-1998 : fix for missing initialization in the driver
Change-Id: I5b1209a871d0a848bb1fdfba5228f181e6968004
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | test/Android.mk | 10 |
2 files changed, 10 insertions, 8 deletions
@@ -192,7 +192,6 @@ LOCAL_SRC_FILES := \ service.cpp LOCAL_STATIC_LIBRARIES := \ - libarmnn-driver@1.0 \ libneuralnetworks_common \ libboost_log \ libboost_program_options \ @@ -200,7 +199,8 @@ LOCAL_STATIC_LIBRARIES := \ libboost_thread \ armnn-arm_compute -LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libarmnn-driver@1.0 LOCAL_SHARED_LIBRARIES := \ libbase \ @@ -259,7 +259,6 @@ LOCAL_SRC_FILES := \ service.cpp LOCAL_STATIC_LIBRARIES := \ - libarmnn-driver@1.1 \ libneuralnetworks_common \ libboost_log \ libboost_program_options \ @@ -267,7 +266,8 @@ LOCAL_STATIC_LIBRARIES := \ libboost_thread \ armnn-arm_compute -LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libarmnn-driver@1.1 LOCAL_SHARED_LIBRARIES := \ libbase \ diff --git a/test/Android.mk b/test/Android.mk index c38b92e8..0e9824fd 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -57,15 +57,16 @@ LOCAL_SRC_FILES := \ 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 @@ LOCAL_SRC_FILES := \ 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 \ |