From d80ed2fc964d68143de37e9acc09998281978181 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Wed, 7 Aug 2019 12:20:42 +0100 Subject: 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 --- Android.bp | 15 +++++++++++++++ Android.mk | 6 ++++++ test/Android.mk | 5 ++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index ba172cbb..8f5b7267 100644 --- a/Android.bp +++ b/Android.bp @@ -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", ] diff --git a/Android.mk b/Android.mk index bee57dd0..aeea704d 100644 --- a/Android.mk +++ b/Android.mk @@ -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 -- cgit v1.2.1