update conanfile

rainyl · Aug 25, 2024 · 2936756 · 2936756
1 parent 14b0b6f
commit 2936756
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -100,14 +100,10 @@ def build_requirements(self):
         # if self.settings.os == "Linux":
         #     self.tool_requires("ffmpeg/6.1")
         if self.settings.os == "Android":
-            # ndk_path = os.environ.get("ANDROID_NDK_HOME", None) or os.environ.get(
-            #     "ANDROID_NDK_ROOT", None
-            # )
-            # if ndk_path is None:
-            #     self.tool_requires("android-ndk/r26c")
-            self.tool_requires("android-ndk/r26d")
-        # if self.settings.os == "iOS":
-        #     self.tool_requires("ios_cmake_toolchain/1.0.0")
+            ndk_path = os.environ.get("ANDROID_NDK_HOME", None)
+            ndk_path = ndk_path or os.environ.get("ANDROID_NDK_ROOT", None)
+            if ndk_path is None:
+                self.tool_requires("android-ndk/r26d")
 
     def layout(self):
         # self.build_folder: build/{os}/{arch}/opencv