Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

android ndk_version #16494

Merged
merged 3 commits into from
Jun 25, 2024
Merged

android ndk_version #16494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea53d82
android ndk_version
memsharded Jun 18, 2024
3a3b3b9
Merge branch 'develop2' into feature/android_ndk_version
memsharded Jun 21, 2024
45ac920
removed warning
memsharded Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conans/client/conf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
ios_version: *ios_version
Android:
api_level: [ANY]
ndk_version: [null, ANY]
FreeBSD:
SunOS:
AIX:
Expand Down
1 change: 1 addition & 0 deletions conans/client/profile_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 10 additions & 0 deletions test/integration/configuration/test_profile_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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