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

Simplify javabin path resolution #152

Merged
merged 4 commits into from
Oct 12, 2023
Merged

Conversation

Bencodes
Copy link
Contributor

@jylinv0
Copy link

jylinv0 commented Oct 6, 2023

Hi Bencodes,
I added tests for android_local_test, could you rerun the checks?

@Bencodes
Copy link
Contributor Author

Bencodes commented Oct 6, 2023

@jylinv0 I rebased this branch so the tests can run again.

It looks like the android_local_test tests are failing on the main branch right now and might need to be fixed before this PR can be merged https://buildkite.com/bazel/rules-android/builds/1935#018b05b8-e1b6-455f-9a98-c6f31693f0d1

@Bencodes
Copy link
Contributor Author

@jylinv0 thanks for fixing the tests in main! This branch is rebased against everything and should be good to review.

if java_executable.startswith("/"):
java_executable = "JAVABIN=" + java_executable

prefix = ctx.attr._runfiles_root_prefix[BuildSettingInfo].value
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can remove _runfiles_root_prefix as well but I suspect it will break internal tests if it's being used.

Copy link

Choose a reason for hiding this comment

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

I'll take care of it.

@copybara-service copybara-service bot merged commit 560d70b into bazelbuild:main Oct 12, 2023
2 checks passed
@Bencodes Bencodes deleted the patch-7 branch November 16, 2023 00:39
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.

2 participants