Commit 84aeb0f7 authored by Ian Wells's avatar Ian Wells Committed by Commit Bot

Disable JDK library desugaring for MB's cronet_android mixin

JDK library desugaring isn't needed for cronet and breaks tests on Kitkat.

Bug: 1140401
Change-Id: I1b4eb25a8cd2564d0fce13e9780656c094c743b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490940Reviewed-by: default avatarErik Staab <estaab@chromium.org>
Commit-Queue: Ian Wells <iwells@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820046}
parent f9d93559
......@@ -2654,7 +2654,8 @@
'default_min_sdk_version=16 '
'clang_use_default_sample_profile=false '
'use_thin_lto=false '
'enable_resource_allowlist_generation=false'),
'enable_resource_allowlist_generation=false '
'enable_jdk_library_desugaring=false'),
},
'cronet_ios': {
......
......@@ -156,6 +156,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -183,6 +184,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -210,6 +212,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -235,6 +238,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -263,6 +267,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -291,6 +296,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -318,6 +324,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -343,6 +350,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......
......@@ -62,6 +62,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -89,6 +90,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......@@ -568,6 +570,7 @@
"default_min_sdk_version": 16,
"disable_file_support": true,
"disable_ftp_support": true,
"enable_jdk_library_desugaring": false,
"enable_reporting": true,
"enable_resource_allowlist_generation": false,
"enable_websockets": false,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment