Skip to content

Commit 9d73206

Browse files
authored
[6.3.0] Restore the classic desugar tool in the Bazel 6.3.0 branch so that the Bazel Android tools can be built for 6.3.0 without breaking backwards compatibility (#18909)
* Revert "Remove desugar binary from Bazel Android Tools" This reverts commit 6d05f25. Re-add "classic" desugar dependencies in the Bazel 6.3.0 branch so that a version of the Android tools can be built that includes the classic desugarer so that we don't introduce breaking changes in a minor release of Bazel. * Revert "Clean Classic Desugar Source Code - Production - 2 / 2" This reverts commit 8ec2428. * Revert "Clean Classic Desugar Source Code - Production - 1 / 2" This reverts commit 21efecd. * Revert "Cleanup Classic Desugar Tests" This reverts commit a8952f5. * Revert "Remove Classic Desugar Tests (with a global exclusion config)" This reverts commit 5767cba. * Fix android_integration_test to work with the head Android tools. integration_test_setup.sh overrides the bazelrc in the test, so it must go before android_helper.sh which appends to the bazelrc to override the Android tools with the version built at head.
1 parent da329e3 commit 9d73206

File tree

305 files changed

+36490
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+36490
-10
lines changed

.bazelci/presubmit.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ tasks:
265265
- "//tools/test/..."
266266
# Re-enable the following tests on Windows:
267267
# https://github.com/bazelbuild/bazel/issues/4292
268+
- "-//src/test/java/com/google/devtools/build/android/desugar/nest/..."
269+
- "-//src/test/java/com/google/devtools/build/android/desugar/stringconcat/..."
270+
- "-//src/test/java/com/google/devtools/build/android/desugar/testing/junit/..."
271+
- "-//src/test/java/com/google/devtools/build/android/desugar/covariantreturn/..."
272+
- "-//src/test/java/com/google/devtools/build/android/desugar/scan/..."
273+
- "-//src/test/java/com/google/devtools/build/android/desugar/typeannotation/..."
268274
- "-//src/test/java/com/google/devtools/build/android/r8/..."
269275
- "-//src/test/java/com/google/devtools/build/lib/query2/cquery/..."
270276
- "-//src/test/java/com/google/devtools/build/lib/query2/engine/..."

0 commit comments

Comments
 (0)