From 5161b88ea6a73aa74d43b6ee98160a76d9aba478 Mon Sep 17 00:00:00 2001
From: yeyunpeng2020 <yeyunpeng1@huawei.com>
Date: Fri, 12 Mar 2021 17:42:00 +0800
Subject: [PATCH] add tf parser

---
 build.sh                                             | 9 ++++++---
 cmake/external_libs/gtest.cmake                      | 4 ++--
 mindspore/lite/tools/cropper/build_cropper_config.sh | 8 +++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index e3d4530cd0..752cd25f78 100755
--- a/build.sh
+++ b/build.sh
@@ -827,10 +827,13 @@ build_java() {
     # install and package
     mkdir -p ${JAVA_PATH}/java/linux_x86/build/lib
     cp ${JAVA_PATH}/java/linux_x86/libs/*.so ${JAVA_PATH}/java/linux_x86/build/lib/jar
-    cp -r ${JAVA_PATH}/java/linux_x86/build/lib/jar ${BASEPATH}/output/mindspore-lite-${VERSION_STR}-inference-linux-x64/lib/
-    cd ${BASEPATH}/output
-    tar czf mindspore-lite-${VERSION_STR}-inference-linux-x64.tar.gz mindspore-lite-${VERSION_STR}-inference-linux-x64
+    cd ${JAVA_PATH}/java/linux_x86/build/
+    cp -r ${JAVA_PATH}/java/linux_x86/build/lib ${JAVA_PATH}/java/linux_x86/build/mindspore-lite-${VERSION_STR}-inference-linux-x64-jar
+    mkdir -p ${JAVA_PATH}/java/linux_x86/build/mindspore-lite-${VERSION_STR}-inference-linux-x64-jar
+    tar czvf mindspore-lite-${VERSION_STR}-inference-linux-x64-jar.tar.gz ./mindspore-lite-${VERSION_STR}-inference-linux-x64-jar
     # copy output
+    cp mindspore-lite-${VERSION_STR}-inference-linux-x64-jar.tar.gz ${BASEPATH}/output
+    cd ${BASEPATH}/output
     [ -n "${VERSION_STR}" ] && rm -rf mindspore-lite-${VERSION_STR}-inference-linux-x64
     exit 0
 }
diff --git a/cmake/external_libs/gtest.cmake b/cmake/external_libs/gtest.cmake
index 9dfd6e90cc..700da26a3c 100644
--- a/cmake/external_libs/gtest.cmake
+++ b/cmake/external_libs/gtest.cmake
@@ -11,7 +11,7 @@ if(BUILD_LITE)
                 -DANDROID_NDK=$ENV{ANDROID_NDK}
                 -DANDROID_ABI=arm64-v8a
                 -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang
-                -DANDROID_STL=c++_shared
+                -DANDROID_STL=${ANDROID_STL}
                 ${CMAKE_OPTION})
     endif()
     if(PLATFORM_ARM32)
@@ -20,7 +20,7 @@ if(BUILD_LITE)
                 -DANDROID_NDK=$ENV{ANDROID_NDK}
                 -DANDROID_ABI=armeabi-v7a
                 -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang
-                -DANDROID_STL=c++_shared
+                -DANDROID_STL=${ANDROID_STL}
                 ${CMAKE_OPTION})
     endif()
 else()
diff --git a/mindspore/lite/tools/cropper/build_cropper_config.sh b/mindspore/lite/tools/cropper/build_cropper_config.sh
index 8b1caeb7e0..99a2b1246d 100644
--- a/mindspore/lite/tools/cropper/build_cropper_config.sh
+++ b/mindspore/lite/tools/cropper/build_cropper_config.sh
@@ -163,12 +163,10 @@ getCommonFile() {
 # automatically generate operator list
 generateOpsList() {
   echo "start generate operator list"
-  ops=()
-  while IFS='' read -r line; do ops+=("$line"); done < <(egrep "PrimitiveType_.* = " "${MINDSPORE_HOME}/mindspore/lite/build/schema/model_generated.h" | awk -F '_' '{print $2}' | awk -F ' ' '{print $1}')
-  ops_num=$((${#ops[@]} - 3))
-  echo "ops nums:${ops_num}"
   ops_list=()
-  mapfile -t ops_list <<< "${ops[*]:1:$ops_num}"
+  while IFS='' read -r line; do ops_list+=("$line"); done < <(grep -Rn "^table" "${MINDSPORE_HOME}/mindspore/lite/schema/ops.fbs" | awk -F ' ' '{print $2}')
+  ops_num=$((${#ops_list[@]}))
+  echo "ops nums:${ops_num}"
 }
 echo "Start getting all file associations."
 generateOpsList