Merge branch 'master' of https://github.com/emgucv/emgutf

emgucv · Dec 10, 2023 · 72094a9 · 72094a9
2 parents daab147 + 261a8bf
commit 72094a9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1591,6 +1591,15 @@ IF(HAVE_ANDROID_LITE)
     COMPONENT emgutf_source
     FILES_MATCHING 
     PATTERN "Emgu.TF.Lite.Android.sln"
+    PATTERN ".git" EXCLUDE
+    PATTERN "bin" EXCLUDE
+    )
+  INSTALL(
+    DIRECTORY
+    ${CMAKE_CURRENT_SOURCE_DIR}/Solution/Android
+    DESTINATION Solution
+    COMPONENT emgutf_example_source
+    FILES_MATCHING 
 	PATTERN "Emgu.TF.Lite.Example.Android.sln"
     PATTERN ".git" EXCLUDE
     PATTERN "bin" EXCLUDE
@@ -1615,7 +1624,7 @@ IF(HAVE_IOS_LITE)
     DIRECTORY
     ${CMAKE_CURRENT_SOURCE_DIR}/Solution/iOS
     DESTINATION Solution
-    COMPONENT emgutf_source
+    COMPONENT emgutf_example_source
     FILES_MATCHING 
     PATTERN "Emgu.TF.Lite.Example.iOS.sln"
     PATTERN ".git" EXCLUDE

diff --git a/components.config b/components.config
diff --git a/platforms/android/build_tflite_android b/platforms/android/build_tflite_android
@@ -24,7 +24,7 @@ set -x
 bazel --output_user_root=$OUTPUT_USER_ROOT \
       build -c opt \
       --config=android_$1\
-      --action_env ANDROID_NDK_HOME=/usr/lib/android-sdk/ndk/21.4.7075529 \
+      --action_env ANDROID_NDK_HOME=/usr/lib/android-sdk/ndk/25.2.9519653 \
       --action_env ANDROID_NDK_API_LEVEL=28 \
       --action_env ANDROID_SDK_API_LEVEL=23 \
       --action_env ANDROID_SDK_HOME=/usr/lib/android-sdk \

diff --git a/tensorflow b/tensorflow