diff options
author | David Beck <david.beck@arm.com> | 2018-10-12 17:23:16 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 17:25:39 +0100 |
commit | c965f3c9d39346fbd188ad5561dda446f56c6f5a (patch) | |
tree | 40618b77ba34ff1bde899703cc28f6af4112facb | |
parent | 3d1059c5b782c5014fe790194b7dd91d2df66c84 (diff) | |
download | android-nn-driver-c965f3c9d39346fbd188ad5561dda446f56c6f5a.tar.gz |
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
-rw-r--r-- | Android.mk | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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 \ |