Skip to content

Commit 2936756

Browse files
committed
update conanfile
1 parent 14b0b6f commit 2936756

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

conanfile.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,10 @@ def build_requirements(self):
100100
# if self.settings.os == "Linux":
101101
# self.tool_requires("ffmpeg/6.1")
102102
if self.settings.os == "Android":
103-
# ndk_path = os.environ.get("ANDROID_NDK_HOME", None) or os.environ.get(
104-
# "ANDROID_NDK_ROOT", None
105-
# )
106-
# if ndk_path is None:
107-
# self.tool_requires("android-ndk/r26c")
108-
self.tool_requires("android-ndk/r26d")
109-
# if self.settings.os == "iOS":
110-
# self.tool_requires("ios_cmake_toolchain/1.0.0")
103+
ndk_path = os.environ.get("ANDROID_NDK_HOME", None)
104+
ndk_path = ndk_path or os.environ.get("ANDROID_NDK_ROOT", None)
105+
if ndk_path is None:
106+
self.tool_requires("android-ndk/r26d")
111107

112108
def layout(self):
113109
# self.build_folder: build/{os}/{arch}/opencv

0 commit comments

Comments
 (0)