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 CrossDir directory creation order for Android #5003

Merged
merged 1 commit into from
Mar 17, 2020
Merged

Fix CrossDir directory creation order for Android #5003

merged 1 commit into from
Mar 17, 2020

Conversation

am11
Copy link
Member

@am11 am11 commented Mar 9, 2020

Follow up on #4915. These are some additional fixes which were identified during the build in docker.

I had a .tools symlink created before, which hid the fact that directory creation order was incorrect, where it tries to resolve the absolute path of __CrossDir.

Also,

  • it turned out that the --subsetCategory argument in runtime/build.sh currently does not respect multiple components that were specified (no error or warning, it just builds the last subset). Therefore, the build instructions are updated with three commands.
  • in case of docker where tty is not available, wget scrolls the progress for each increment and clutters the log output. Added --progress=bar:force:noscroll to keep the progress on single line.

@am11
Copy link
Member Author

am11 commented Mar 9, 2020

@janvorli, @jkoritzinsky, please take a look. Thanks!

Copy link
Member

@jkoritzinsky jkoritzinsky left a comment

Choose a reason for hiding this comment

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

This file lives under eng/common, so the next change to it in Arcade will overwrite the file. Can you instead make a PR to update this file in the dotnet/arcade repo to ensure it propagates correctly throughout the repos?

Nevermind didn't realize this PR was in dotnet/arcade. That's on me. Ignore this comment (the sub comments are still relevant).

eng/common/cross/build-android-rootfs.sh Show resolved Hide resolved
eng/common/cross/build-android-rootfs.sh Show resolved Hide resolved
@am11
Copy link
Member Author

am11 commented Mar 17, 2020

@janvorli, could this be merged? This is a bug fix, which we need for Android builds.

@janvorli
Copy link
Member

@am11 I cannot merge it (the merge button is greyed out) as some required test legs have failed. I am trying to restart the legs now.

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 dbc2abc into dotnet:master Mar 17, 2020
@am11 am11 deleted the feature/android-build branch March 17, 2020 20:00
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