Browse Source

fix gtest cmake bug

tags/v1.2.0-rc1
yeyunpeng2020 4 years ago
parent
commit
3dbeca94ba
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      cmake/external_libs/gtest.cmake
  2. +2
    -2
      mindspore/lite/examples/quick_start_java/src/main/java/com/mindspore/lite/demo/Main.java

+ 2
- 2
cmake/external_libs/gtest.cmake View File

@@ -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 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DANDROID_STL=c++_shared
${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 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DANDROID_STL=c++_shared
${CMAKE_OPTION})
endif()
else()


+ 2
- 2
mindspore/lite/examples/quick_start_java/src/main/java/com/mindspore/lite/demo/Main.java View File

@@ -37,8 +37,8 @@ public class Main {
}

private static boolean compile() {
MSConfig msConfig = new MSConfig(DeviceType.DT_CPU, 2);
boolean ret = msConfig.init();
MSConfig msConfig = new MSConfig();
boolean ret = msConfig.init(DeviceType.DT_CPU, 2);
if (!ret) {
System.err.println("Init context failed");
return false;


Loading…
Cancel
Save