From d1aff691347b500a1ba785036ab58338db70fed1 Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Thu, 19 Nov 2020 20:44:55 +0800 Subject: [PATCH] change to depend on static mmpa --- parser/CMakeLists.txt | 3 ++- parser/common/CMakeLists.txt | 2 +- parser/common/module.mk | 3 ++- parser/module.mk | 5 +++-- parser/onnx/CMakeLists.txt | 3 ++- parser/onnx/module.mk | 5 +++-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt index 6419f74..35ce7fa 100644 --- a/parser/CMakeLists.txt +++ b/parser/CMakeLists.txt @@ -92,6 +92,7 @@ target_include_directories(fmk_parser PRIVATE target_link_libraries(fmk_parser $ + static_mmpa -Wl,--no-as-needed ascend_protobuf error_manager @@ -101,10 +102,10 @@ target_link_libraries(fmk_parser _caffe_parser c_sec slog - mmpa -Wl,--as-needed json -lrt + -ldl ) ################################################################## diff --git a/parser/common/CMakeLists.txt b/parser/common/CMakeLists.txt index dcfc5a5..7471782 100644 --- a/parser/common/CMakeLists.txt +++ b/parser/common/CMakeLists.txt @@ -75,13 +75,13 @@ target_include_directories(parser_common PRIVATE target_link_libraries(parser_common PRIVATE $ + static_mmpa -Wl,--no-as-needed graph ascend_protobuf register c_sec slog - mmpa error_manager -Wl,--as-needed json diff --git a/parser/common/module.mk b/parser/common/module.mk index 79210c5..3dd4e0d 100644 --- a/parser/common/module.mk +++ b/parser/common/module.mk @@ -94,11 +94,12 @@ LOCAL_SHARED_LIBRARIES := \ libascend_protobuf \ libslog \ libgraph \ - libmmpa \ libc_sec \ liberror_manager \ libregister \ +LOCAL_STATIC_LIBRARIES += libmmpa + LOCAL_LDFLAGS := -lrt -ldl include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/parser/module.mk b/parser/module.mk index 8847790..fdd61a5 100644 --- a/parser/module.mk +++ b/parser/module.mk @@ -115,7 +115,6 @@ LOCAL_C_INCLUDES := $(COMMON_LOCAL_C_INCLUDES) LOCAL_SHARED_LIBRARIES := \ libascend_protobuf \ libslog \ - libmmpa \ libc_sec \ liberror_manager \ libparser_common \ @@ -123,7 +122,9 @@ LOCAL_SHARED_LIBRARIES := \ libregister \ lib_caffe_parser \ -LOCAL_LDFLAGS := -lrt +LOCAL_STATIC_LIBRARIES += libmmpa + +LOCAL_LDFLAGS := -lrt -ldl include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/parser/onnx/CMakeLists.txt b/parser/onnx/CMakeLists.txt index 82dc484..10243a1 100644 --- a/parser/onnx/CMakeLists.txt +++ b/parser/onnx/CMakeLists.txt @@ -62,6 +62,7 @@ target_include_directories(fmk_onnx_parser PRIVATE target_link_libraries(fmk_onnx_parser PRIVATE $ + static_mmpa -Wl,--no-as-needed ascend_protobuf register @@ -69,10 +70,10 @@ target_link_libraries(fmk_onnx_parser PRIVATE parser_common graph slog - mmpa -Wl,--as-needed json -lrt + -ldl ) ############ install ############ diff --git a/parser/onnx/module.mk b/parser/onnx/module.mk index 3ba1f91..cc673e2 100644 --- a/parser/onnx/module.mk +++ b/parser/onnx/module.mk @@ -46,12 +46,13 @@ LOCAL_C_INCLUDES := \ LOCAL_SHARED_LIBRARIES := \ libascend_protobuf \ libslog \ - libmmpa \ libc_sec \ libparser_common \ libgraph \ libregister \ -LOCAL_LDFLAGS := -lrt + LOCAL_STATIC_LIBRARIES += libmmpa + +LOCAL_LDFLAGS := -lrt -ldl include $(BUILD_HOST_SHARED_LIBRARY)