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

Fix Android build issues #598

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

slawomiradamczyk
Copy link
Contributor

Binary "dlt-test-logstorage" doesn't have a source code and soong fails. This commit removes that binary.

Added two defines "DLT_WRITEV_TIMEOUT_SEC, DLT_WRITEV_TIMEOUT_USEC" that are used by dlt_user_shared.c"

Binary "dlt-test-logstorage" doesn't have a source code and soong fails.
This commit removes that binary.

Added two defines "DLT_WRITEV_TIMEOUT_SEC, DLT_WRITEV_TIMEOUT_USEC" that
are used by dlt_user_shared.c"
@minminlittleshrimp
Copy link
Collaborator

Hello @slawomiradamczyk
The dlt-test-logstorage should be also upstreamed.
Hello @Bichdao021195 , could you kindly check this?
Regards

@slawomiradamczyk
Copy link
Contributor Author

Well I really don't know how, cause there is no source code for it?

@minminlittleshrimp
Copy link
Collaborator

No worry @slawomiradamczyk
Maybe the upstream by our team member missing that, I am working internally for the source code.
Sorry for any inconvenience.
Regards

@@ -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.

@michael-methner michael-methner merged commit f7f63ad into COVESA:master Mar 13, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants