Skip to content

[7.0.0] android_local_test isn't compatible with Android Platforms #20215

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

Merged
merged 1 commit into from
Nov 15, 2023

Conversation

bazel-io
Copy link
Member

  1. Remove target_compatible_with from the Android toolchains generated in the Starlark and native android_sdk_repository rules so that they can be selected with a host JDK in android_local_test

  2. Re-enable android_local_test_integration_test.sh

  3. Switch --platforms to --android_platforms in the android integration test setup so that a host JDK can be selected in android_local_test

Fixes #19829

RELNOTES: None
Commit 9bbc2cb

PiperOrigin-RevId: 582716155
Change-Id: I49d6a9058218d522b9ebb7cc6842fe20c36e2798

1. Remove `target_compatible_with` from the Android toolchains generated in the Starlark and native `android_sdk_repository` rules so that they can be selected with a host JDK in android_local_test

1. Re-enable `android_local_test_integration_test.sh`

1. Switch `--platforms` to `--android_platforms` in the android integration test setup so that a host JDK can be selected in android_local_test

Fixes bazelbuild#19829

RELNOTES: None
PiperOrigin-RevId: 582716155
Change-Id: I49d6a9058218d522b9ebb7cc6842fe20c36e2798
@bazel-io bazel-io requested a review from a team as a code owner November 15, 2023 18:05
@bazel-io bazel-io added team-Android Issues for Android team awaiting-review PR is awaiting review from an assigned reviewer labels Nov 15, 2023
@keertk keertk requested review from katre and ahumesky November 15, 2023 18:28
@keertk
Copy link
Member

keertk commented Nov 15, 2023

Only 9bbc2cb was cherry-picked since the issue was closed with this commit, but let me know if we need to include updates from the other CL as well (once submitted).

@katre
Copy link
Member

katre commented Nov 15, 2023

Should this also mark #19883 as fixed?

@keertk
Copy link
Member

keertk commented Nov 15, 2023

Yes, I'll close #19883 once this is merged.

@keertk keertk enabled auto-merge (squash) November 15, 2023 18:31
@keertk keertk merged commit 5ad64b2 into bazelbuild:release-7.0.0 Nov 15, 2023
@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Nov 15, 2023
@meteorcloudy
Copy link
Member

meteorcloudy commented Nov 16, 2023

Maybe we can append a line like Closes #19883 in the PR description so that the cherry-pick issue gets closed automatically.

@keertk
Copy link
Member

keertk commented Nov 16, 2023

So this unfortunately doesn't work with PRs against non-default branches (doc). But I believe @iancha1992 is looking into creating a small workflow that automatically closes these blocker issues.

@meteorcloudy
Copy link
Member

Oh, I see! Thanks, I didn't know that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team-Android Issues for Android team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants