Skip to content

Commit 0ee3da7

Browse files
authored
android ndk_version (#16494)
* android ndk_version * removed warning
1 parent dad8cb7 commit 0ee3da7

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

conans/client/conf/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
ios_version: *ios_version
6363
Android:
6464
api_level: [ANY]
65+
ndk_version: [null, ANY]
6566
FreeBSD:
6667
SunOS:
6768
AIX:

conans/client/profile_loader.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def profile_plugin(profile):
4141
_check_correct_cppstd(settings)
4242
_check_correct_cstd(settings)
4343
44+
4445
def _check_correct_cppstd(settings):
4546
from conan.tools.scm import Version
4647
def _error(compiler, cppstd, min_version, version):

test/integration/configuration/test_profile_plugin.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,13 @@ def test_remove_plugin_file(self):
2626
os.remove(os.path.join(c.cache.plugins_path, "profile.py"))
2727
c.run("profile show", assert_error=True)
2828
assert "ERROR: The 'profile.py' plugin file doesn't exist" in c.out
29+
30+
31+
def test_android_ndk_version():
32+
c = TestClient()
33+
c.run("profile show -s os=Android")
34+
assert "os.ndk_version" not in c.out
35+
c.run("profile show -s os=Android -s os.ndk_version=r26")
36+
assert "os.ndk_version=r26" in c.out
37+
c.run("profile show -s os=Android -s os.ndk_version=r26a")
38+
assert "os.ndk_version=r26a" in c.out

0 commit comments

Comments
 (0)