Skip to content
This repository has been archived by the owner on Jan 4, 2021. It is now read-only.

Commit

Permalink
Revert "Changed ANDROID_STL to use settings.compiler.libcxx"
Browse files Browse the repository at this point in the history
This reverts commit 386c508.
  • Loading branch information
vok1980 committed Jan 17, 2020
1 parent 3597987 commit ce3bbd3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def configure(self):
"but used %s" % (self.settings.arch, api_level))
if self.settings.compiler.version != "8":
raise ConanInvalidConfiguration("only Clang 8 is supported")
if not str(self.settings.compiler.libcxx) in ["c++_shared", "c++_static"]:
if self.settings.compiler.libcxx != "libc++":
raise ConanInvalidConfiguration("only libc++ standard library is supported")

def source(self):
Expand Down Expand Up @@ -204,7 +204,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 = str(self.settings.compiler.libcxx)
self.env_info.ANDROID_STL = "c++_static"

self.env_info.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
self.env_info.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
Expand Down

0 comments on commit ce3bbd3

Please sign in to comment.