-
Notifications
You must be signed in to change notification settings - Fork 988
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.
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
[AutotoolsToolchain] Honoring tools.android:ndk_path
conf
#16502
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
import os | ||
import platform | ||
import textwrap | ||
|
||
import pytest | ||
|
||
from conan.test.assets.sources import gen_function_cpp, gen_function_h | ||
from conan.test.utils.tools import TestClient | ||
from test.conftest import tools_locations | ||
|
||
|
||
@pytest.mark.parametrize("arch, expected_arch", [('armv8', 'aarch64'), | ||
('armv7', 'arm'), | ||
('x86', 'i386'), | ||
('x86_64', 'x86_64') | ||
]) | ||
@pytest.mark.tool("android_ndk") | ||
@pytest.mark.tool("autotools") | ||
@pytest.mark.skipif(platform.system() != "Darwin", reason="NDK only installed on MAC") | ||
def test_android_meson_toolchain_cross_compiling(arch, expected_arch): | ||
profile_host = textwrap.dedent(""" | ||
include(default) | ||
|
||
[settings] | ||
os = Android | ||
os.api_level = 21 | ||
arch = {arch} | ||
|
||
[conf] | ||
tools.android:ndk_path={ndk_path} | ||
""") | ||
ndk_path = tools_locations["android_ndk"]["system"]["path"][platform.system()] | ||
profile_host = profile_host.format( | ||
arch=arch, | ||
ndk_path=ndk_path | ||
) | ||
|
||
client = TestClient(path_with_spaces=False) | ||
client.run("new autotools_lib -d name=hello -d version=1.0") | ||
client.save({"profile_host": profile_host}) | ||
client.run("build . --profile:build=default --profile:host=profile_host") | ||
libhello = os.path.join("build-release", "src", ".libs", "libhello.a") | ||
# Check binaries architecture | ||
client.run_command('objdump -f "%s"' % libhello) | ||
assert "architecture: %s" % expected_arch in client.out |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if
ndk_path
is not defined? Isn't it mandatory in other places?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's true that if it's not defined, in other toolchains like Meson or CMake, it is raised as an exception, but do we want to do that here? It'd be a breaking change because people have always included all the needed flags via
buildenv
.