From 74ecc7c988b0d2b69fefac6e86ad265b501b26de Mon Sep 17 00:00:00 2001
From: sunsuodong <sunsuodong@huawei.com>
Date: Thu, 16 Sep 2021 02:31:45 -0700
Subject: [PATCH] remove redundant strip

---
 cmake/external_libs/opencv.cmake          |  4 ++--
 mindspore/lite/java/native/CMakeLists.txt | 13 -------------
 mindspore/lite/micro/coder/CMakeLists.txt |  3 ---
 mindspore/lite/src/CMakeLists.txt         | 19 -------------------
 4 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/cmake/external_libs/opencv.cmake b/cmake/external_libs/opencv.cmake
index e8d0ad45ec0..19162fd8762 100644
--- a/cmake/external_libs/opencv.cmake
+++ b/cmake/external_libs/opencv.cmake
@@ -18,7 +18,7 @@ else()
         set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
     endif()
     set(opencv_CFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2 -O2")
-    set(opencv_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
+    set(opencv_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack -s")
 endif()
 
 if(ENABLE_GITEE)
@@ -49,7 +49,7 @@ if(MSVC)
     mindspore_add_pkg(opencv
             VER 4.5.1
             LIBS opencv_core451.lib opencv_imgcodecs451.lib opencv_imgproc451.lib
-            LIB_PATH x64/vc15/lib
+            LIB_PATH x64/*/lib
             URL ${REQ_URL}
             MD5 ${MD5}
             CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF
diff --git a/mindspore/lite/java/native/CMakeLists.txt b/mindspore/lite/java/native/CMakeLists.txt
index 8aedbace710..4e1367e4d15 100644
--- a/mindspore/lite/java/native/CMakeLists.txt
+++ b/mindspore/lite/java/native/CMakeLists.txt
@@ -100,16 +100,3 @@ if(SUPPORT_TRAIN)
         target_link_libraries(mindspore-lite-train-jni ${LITE_TRAIN_SO_NAME})
     endif()
 endif()
-
-set(NDK_STRIP
-        "${ANDROID_NDK}/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/aarch64-linux-android/bin/strip")
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-    if(PLATFORM_ARM64 OR PLATFORM_ARM32)
-        add_custom_command(TARGET mindspore-lite-jni POST_BUILD COMMAND ${NDK_STRIP}
-                ${CMAKE_BINARY_DIR}/libmindspore-lite*.so)
-    elseif(NOT WIN32)
-        add_custom_command(TARGET mindspore-lite-jni POST_BUILD COMMAND strip
-                ${CMAKE_BINARY_DIR}/libmindspore-lite*.so)
-    endif()
-endif()
-
diff --git a/mindspore/lite/micro/coder/CMakeLists.txt b/mindspore/lite/micro/coder/CMakeLists.txt
index 274cc5976f6..79358279709 100644
--- a/mindspore/lite/micro/coder/CMakeLists.txt
+++ b/mindspore/lite/micro/coder/CMakeLists.txt
@@ -36,7 +36,4 @@ if(MSLITE_ENABLE_CONVERTER)
         target_link_libraries(codegen PRIVATE
                 ${OBF_LIB_DIR}/libmsdeobfuscator-lite.so)
     endif()
-    if(NOT WIN32 AND "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-        add_custom_command(TARGET codegen POST_BUILD COMMAND strip ${CODEGEN_PATH})
-    endif()
 endif()
diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt
index f41cb5f1191..cc1e6576f5a 100644
--- a/mindspore/lite/src/CMakeLists.txt
+++ b/mindspore/lite/src/CMakeLists.txt
@@ -332,25 +332,6 @@ if(SUPPORT_TRAIN)
   target_link_libraries(mindspore-lite-train_static minddata-lite mindspore-lite)
 endif()
 
-if(NOT APPLE AND PLATFORM_ARM)
-    set(NDK_STRIP
-        "${ANDROID_NDK}/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/aarch64-linux-android/bin/strip")
-    if(TARGET_HIMIX200)
-        set(NDK_STRIP ${HIMIX_STRIP})
-    elseif(TARGET_OHOS_LITE)
-        set(NDK_STRIP "llvm-strip")
-    endif()
-endif()
-
-if(NOT APPLE AND "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-    if(PLATFORM_ARM)
-        add_custom_command(TARGET mindspore-lite POST_BUILD COMMAND ${NDK_STRIP}
-                ${CMAKE_BINARY_DIR}/src/libmindspore-lite*.so)
-    elseif(NOT WIN32)
-        add_custom_command(TARGET mindspore-lite POST_BUILD COMMAND strip ${CMAKE_BINARY_DIR}/src/libmindspore-lite*.so)
-    endif()
-endif()
-
 ########################## build optimize and float16 library #################################
 if(PLATFORM_ARM)
     if(PLATFORM_ARM64)