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

[Cherrypick request 4.2.0] Upgrade Android tools to 0.23 #13702

Closed
wants to merge 2 commits into from
Closed

[Cherrypick request 4.2.0] Upgrade Android tools to 0.23 #13702

wants to merge 2 commits into from

Conversation

ahumesky
Copy link
Contributor

@ahumesky ahumesky commented Jul 16, 2021

Cherrypick request for 4.2.0 (#13558).

This was originally 80feea0 and 586de95
This fixes merge conflicts from subsequent changes to the WORKSPACE file.
These change are to enable new features (androidx support in databinding) and fix bugs (e.g. c3edf13) in the android rules

*** Reason for rollback ***

Downstream projects on bazelci have been updated to not hardcode the buildtools versions: #13409 (comment)

*** Original change description ***

Automated rollback of commit b6f87f1.

*** Reason for rollback ***

Breaks downstream bazel projects because AAPT2 needs to be updated in the build images:
https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/2010#2595dff6-44ac-4996-9b38-cdacf2842215

*** Original change description ***

Updates Android remote tools to 0.23.0 to include Update remote android tools to include c3edf13.

RELNOTES: None.
PiperOrigin-RevId: 377971964

*** Reason for rollback ***

Downstream projects on bazelci have been updated to not hardcode the buildtools versions: #13409 (comment)

*** Original change description ***

Automated rollback of commit b6f87f1.

*** Reason for rollback ***

Breaks downstream bazel projects because AAPT2 needs to be updated in the build images:
https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/2010#2595dff6-44ac-4996-9b38-cdacf2842215

*** Original change description ***

Updates Android remote tools to 0.23.0 to include Update remote android tools to include c3edf13.

RELNOTES: None.
PiperOrigin-RevId: 377971964
@katre
Copy link
Member

katre commented Jul 21, 2021

Looks like the test failures are due to this:
``
Building external/bazel_tools/src/tools/android/java/com/google/devtools/build/android/dexer/libdexer.jar (15 source files) and running annotation processors (AutoValueProcessor); 3s multiplex-worker ... (3 actions running)
ERROR: /var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/ec321eb2cc2d0f8f91b676b6d4c66c29/sandbox/linux-sandbox/5629/execroot/io_bazel/_tmp/470db9ccb71c58a9cca366f9c563eaf0/workspace.oWcPyBeP/java/bazel/BUILD:1:15: Desugaring java/bazel/bin_resources.jar for Android failed: (Exit 2): desugar_java8 failed: error executing command bazel-out/k8-opt-exec-2B5CBBC6/bin/external/bazel_tools/tools/android/desugar_java8 @bazel-out/k8-fastbuild/bin/java/bazel/bin_resources.jar_desugared.jar-0.params
Use --sandbox_debug to see verbose messages from the sandbox
Error parsing command line: Unrecognized option: --retarget_core_library_member


Is there another commit required to either add this option or stop it being added?

@katre katre changed the title Automated rollback of commit 9a1d428e33bfae1ec5b68250d4732b72346b8b39. [Cherrypick request 4.2.0] Upgrade Android tools to 0.23 Jul 21, 2021
@katre
Copy link
Member

katre commented Jul 21, 2021

Let me know if the new title is inaccurate.

@ahumesky
Copy link
Contributor Author

Thanks for pointing that out, yes I think there are some other changes that need to be added before this can be merged. I'll have to go find them since it's been a while since this was all submitted

@ahumesky
Copy link
Contributor Author

Let me know if the new title is inaccurate.

Title looks good

@ahumesky
Copy link
Contributor Author

I found the other change: 586de95
That's an earlier update to the android tools, so they touch the same files, so this change will conflict with the merge here, as well as all the other conflicts that I ran into when cherrypicking the first one.

I'll try to merge them all into one change here.

@katre
Copy link
Member

katre commented Jul 23, 2021

Please rebase onto the latest release-4.2.0-patches branch.

@ahumesky
Copy link
Contributor Author

Abandoning this pull request for a more convenient pull request:
#13738

@ahumesky ahumesky closed this Jul 23, 2021
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.

2 participants