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

Fix Android build issues #598

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Fix Android build issues #598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 2 additions & 15 deletions Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ cc_defaults {
"-DDLT_LIB_USE_UNIX_SOCKET_IPC",
"-DCONFIGURATION_FILES_DIR=\"/vendor/etc\"",
"-DDLT_USER_IPC_PATH=\"/dev/socket\"",
"-DDLT_WRITEV_TIMEOUT_SEC=1",
"-DDLT_WRITEV_TIMEOUT_USEC=0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @slawomiradamczyk ,
can you remove the configuration change from the Android.bp? I assume that this is unrelated to the the compile issue.

I would then merge this PR, as we are currently not able upstream our changes due to limited team capacity.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I remove it it will stop compiling on Android. Those defines are required in file/src/shared/dlt_user_shared.c, which is part of libdlt target which is needed for dlt-logd-converter ;)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right. i missed that one. Thanks for your contribution and patience.

] + [
"-Wno-unused-parameter",
"-W",
Expand Down Expand Up @@ -249,21 +251,6 @@ cc_binary {
],
}

cc_binary {

name: "dlt-test-logstorage",
defaults: ["dlt_defaults"],

srcs: [
"src/tests/dlt-test-logstorage.c",
],

shared_libs: [
"libc",
"libdlt",
],
}

cc_binary {

name: "dlt-test-multi-process",
Expand Down
Loading