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.

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

Improve xmake.lua for android #236

Merged
merged 2 commits into from
Nov 2, 2023
Merged

Improve xmake.lua for android #236

merged 2 commits into from
Nov 2, 2023

Conversation

waruqi
Copy link
Contributor

@waruqi waruqi commented Nov 2, 2023

@waruqi waruqi changed the title Improve xmake.ua for android Improve xmake.lua for android Nov 2, 2023
guri87-byte and others added 2 commits November 2, 2023 12:15
covering Android builds for armv7a and x86_64.

Signed-off-by: ruki <[email protected]>
@waruqi
Copy link
Contributor Author

waruqi commented Nov 2, 2023

I have improved elfutils package in xmake-repo. we need update it first.

xrepo update-repo
xrepo remove --all -y elfutils
xmake f -p android -c --require-bpftool=y
xmake

about elfutils issue:

This is because after the elfutils package in xmake-repo was installed, its make install script did not automatically install elf.h, so elfutils/libelf.h automatically found elf.h on the system, resulting in some header file conflicts.

see this patch: xmake-io/xmake-repo@e743cdc

This was referenced Nov 2, 2023
@guri87-byte
Copy link
Contributor

Thank you @waruqi

@anakryiko
Copy link
Member

Great, thanks a lot for the fixes and improvements!

@anakryiko anakryiko merged commit 7b1c6e3 into libbpf:master Nov 2, 2023
12 checks passed
@waruqi waruqi deleted the android branch November 2, 2023 05:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants