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

Fix build without FEATURE_EVENT_TRACE #32746

Merged
merged 1 commit into from
Feb 25, 2020
Merged

Fix build without FEATURE_EVENT_TRACE #32746

merged 1 commit into from
Feb 25, 2020

Conversation

am11
Copy link
Member

@am11 am11 commented Feb 24, 2020 •
edited
Loading

  • Add dummy target eventing_headers
  • Add missing events in etmdummy.h and fix include paths to it in two other sources
  • Fix the invalid #elif // FEATUREE_EVENT_TRACE (supposed to be #else)
  • Minor formatting fixes

Tested with Ubuntu 18 and Android NDK v r21 (and API v28) in rootfs.

@am11 am11 marked this pull request as ready for review February 24, 2020 18:52
@am11
Copy link
Member Author

am11 commented Feb 24, 2020

cc @janvorli, @jkotas
I am in a process of reviving Android build with the latest version of NDK r21, lttng-ust is not yet available in their package distribution. coreclr and installer native components are compiling, libraries is work in progress. Patch was getting big, so I have split the work into separate branches.

jkotas
jkotas approved these changes Feb 24, 2020
View reviewed changes
Copy link
Member

@jkotas jkotas left a comment

Choose a reason for hiding this comment

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

Thanks!

This was referenced Feb 25, 2020
Merged
Merged
janvorli
janvorli approved these changes Feb 25, 2020
View reviewed changes
Copy link
Member

@janvorli janvorli left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@janvorli janvorli merged commit e08396c into dotnet:master Feb 25, 2020
@am11 am11 deleted the feature/build-with-tracing-disabled branch February 25, 2020 22:20
@am11 am11 mentioned this pull request Mar 5, 2020
Merged
@ghost ghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jkotas jkotas jkotas approved these changes

@janvorli janvorli janvorli approved these changes

Assignees
No one assigned
Labels
area-Tracing-coreclr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@am11 @jkotas @janvorli