From a328deb798d0ba1d32bc7062cb96ffce21a9d757 Mon Sep 17 00:00:00 2001 From: Vyacheslav Koscheev Date: Fri, 17 Jan 2020 17:37:54 +0700 Subject: [PATCH] Fix compiler.libcxx for r20b --- conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index cfa53f4..b48b072 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,6 +23,9 @@ class AndroidNDKInstallerConan(ConanFile): "os": ["Android"], "arch": ["x86", "x86_64", "armv7", "armv8"]} + options = {"libcxx_shared": [True, False]} + default_options = {'libcxx_shared': False} + def configure(self): api_level = int(str(self.settings.os.api_level)) if self.settings.os_build in ["Linux", "Macos"] and self.settings.arch_build == "x86": @@ -204,7 +207,7 @@ def package_info(self): self.env_info.ANDROID_PLATFORM = "android-%s" % self.settings.os.api_level self.env_info.ANDROID_TOOLCHAIN = "clang" self.env_info.ANDROID_ABI = self._android_abi - self.env_info.ANDROID_STL = "c++_static" + self.env_info.ANDROID_STL = "c++_shared" if self.options.libcxx_shared else "c++_static" self.env_info.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" self.env_info.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"