diff --git a/conans/client/conf/__init__.py b/conans/client/conf/__init__.py index 0ac9b8a2ded..33c9db521be 100644 --- a/conans/client/conf/__init__.py +++ b/conans/client/conf/__init__.py @@ -62,6 +62,7 @@ ios_version: *ios_version Android: api_level: [ANY] + ndk_version: [null, ANY] FreeBSD: SunOS: AIX: diff --git a/conans/client/profile_loader.py b/conans/client/profile_loader.py index c532e6b6912..ad4808177c8 100644 --- a/conans/client/profile_loader.py +++ b/conans/client/profile_loader.py @@ -41,6 +41,7 @@ def profile_plugin(profile): _check_correct_cppstd(settings) _check_correct_cstd(settings) + def _check_correct_cppstd(settings): from conan.tools.scm import Version def _error(compiler, cppstd, min_version, version): diff --git a/test/integration/configuration/test_profile_plugin.py b/test/integration/configuration/test_profile_plugin.py index a88eb0de7f3..10e42c1596d 100644 --- a/test/integration/configuration/test_profile_plugin.py +++ b/test/integration/configuration/test_profile_plugin.py @@ -26,3 +26,13 @@ def test_remove_plugin_file(self): os.remove(os.path.join(c.cache.plugins_path, "profile.py")) c.run("profile show", assert_error=True) assert "ERROR: The 'profile.py' plugin file doesn't exist" in c.out + + +def test_android_ndk_version(): + c = TestClient() + c.run("profile show -s os=Android") + assert "os.ndk_version" not in c.out + c.run("profile show -s os=Android -s os.ndk_version=r26") + assert "os.ndk_version=r26" in c.out + c.run("profile show -s os=Android -s os.ndk_version=r26a") + assert "os.ndk_version=r26a" in c.out