Skip to content

Commit

Permalink
Revert "Enable JDK library desugaring by default"
Browse files Browse the repository at this point in the history
This reverts commit 8699ff5.

Reason for revert: Caused crbug.com/1140401 and various other failures.

Original change's description:
> Enable JDK library desugaring by default
>
> Bug: 1056751
> Change-Id: Id517413e180ad7cc2f7688d47038587f2a3ecb5e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2458853
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Ian Wells <iwells@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#817575}

TBR=agrieve@chromium.org,iwells@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1056751
Change-Id: I3da3c17f6b56f7233232f5ae9eee4af83158b525
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2487817
Reviewed-by: Ian Wells <iwells@chromium.org>
Commit-Queue: Ian Wells <iwells@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819209}
  • Loading branch information
Ian Wells authored and Commit Bot committed Oct 21, 2020
1 parent c6e8e50 commit afcc3ce
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build/config/android/config.gni
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ if (is_android || is_chromeos ||

# Enables Java library desugaring.
# This will cause an extra classes.dex file to appear in every apk.
enable_jdk_library_desugaring = true
enable_jdk_library_desugaring = false
}

# Host stuff -----------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions third_party/accessibility_test_framework/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ android_java_prebuilt("accessibility_test_framework_java") {
# Uses wrong version of proto (not protolite).
# Disable these to avoid build warnings.
enable_bytecode_checks = false
enable_desugar = false

jar_path = "lib/accessibility-test-framework.jar"
deps = [
Expand Down
4 changes: 4 additions & 0 deletions third_party/byte_buddy/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ java_prebuilt("byte_buddy_java") {
testonly = true
supports_android = true
enable_bytecode_checks = false
enable_desugar = false
jar_path = "lib/byte-buddy.jar"
}

java_prebuilt("byte_buddy_agent_java") {
testonly = true
supports_android = true
enable_bytecode_checks = false
enable_desugar = false
jar_path = "lib/byte-buddy-agent.jar"
}

Expand All @@ -25,12 +27,14 @@ java_prebuilt("dx_25_0_2_java") {
supports_android = true
requires_android = true
no_build_hooks = true
enable_desugar = false
jar_path = "android_sdk_build_tools_25_0_2/build-tools/25.0.2/lib/dx.jar"
}

android_java_prebuilt("byte_buddy_android_java") {
testonly = true
enable_bytecode_checks = false
enable_desugar = false
deps = [ ":dx_25_0_2_java" ]
proguard_configs = [ "//third_party/byte_buddy/proguard.flags" ]
jar_path = "lib/byte-buddy-android.jar"
Expand Down
1 change: 1 addition & 0 deletions third_party/google-truth/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ java_prebuilt("google_truth_java") {

# Uses the difflib package, which doesn't exist in third_party.
enable_bytecode_checks = false
enable_desugar = false
supports_android = true

# requires_android because of dependency on guava_android.
Expand Down

0 comments on commit afcc3ce

Please sign in to comment.