diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-08-07 12:20:42 +0100 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-08-07 15:21:47 +0000 |
| commit | d80ed2fc964d68143de37e9acc09998281978181 (patch) | |
| tree | 78b5794527077376a6c5f3ef2aedfdffcbe230b5 | |
| parent | 28e3d9faaa22d6ac837072e159a313ca444274a2 (diff) | |
| download | android-nn-driver-d80ed2fc964d68143de37e9acc09998281978181.tar.gz | |
IVGCVSW-3595 Implement the LoadDynamicBackends function in the Runtime class
* Updated the makefiles to include boost::filesystem
!armnn:1702
Change-Id: Ibe0a696d9fd473b552602266a89465289e9dc043
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
| -rw-r--r-- | Android.bp | 15 | ||||
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | test/Android.mk | 5 |
3 files changed, 25 insertions, 1 deletions
@@ -907,6 +907,21 @@ cc_library_static { ], } +cc_library_static { + name: "libboost_filesystem", + defaults: ["libboost-defaults"], + srcs: [ + "boost_1_64_0/libs/filesystem/src/codecvt_error_category.cpp", + "boost_1_64_0/libs/filesystem/src/operations.cpp", + "boost_1_64_0/libs/filesystem/src/path.cpp", + "boost_1_64_0/libs/filesystem/src/path_traits.cpp", + "boost_1_64_0/libs/filesystem/src/portability.cpp", + "boost_1_64_0/libs/filesystem/src/unique_path.cpp", + "boost_1_64_0/libs/filesystem/src/utf8_codecvt_facet.cpp", + "boost_1_64_0/libs/filesystem/src/windows_file_codecvt.cpp", + ], +} + subdirs = [ "armnn", ] @@ -124,6 +124,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_program_options \ libboost_system \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn @@ -237,6 +238,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_program_options \ libboost_system \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn @@ -343,6 +345,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_program_options \ libboost_system \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn @@ -418,6 +421,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_program_options \ libboost_system \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := \ @@ -508,6 +512,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_program_options \ libboost_system \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := \ @@ -586,6 +591,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_program_options \ libboost_system \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := \ diff --git a/test/Android.mk b/test/Android.mk index 2f0e03ec..93bfa695 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -74,6 +74,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_system \ libboost_unit_test_framework \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := \ @@ -178,6 +179,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_system \ libboost_unit_test_framework \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := \ @@ -277,6 +279,7 @@ LOCAL_STATIC_LIBRARIES := \ libboost_system \ libboost_unit_test_framework \ libboost_thread \ + libboost_filesystem \ armnn-arm_compute LOCAL_WHOLE_STATIC_LIBRARIES := \ @@ -307,4 +310,4 @@ endif include $(BUILD_EXECUTABLE) -endif # PLATFORM_VERSION == Q
\ No newline at end of file +endif # PLATFORM_VERSION == Q |