Commit 4c4003f9 authored by anthonyvd's avatar anthonyvd Committed by Commit Bot

Revert "Adds Desugar's jdk_libs_configuration to the build"

This reverts commit 8444271f.

Reason for revert: Causing build failures, see https://ci.chromium.org/p/chromium/builders/ci/android-archive-rel/14156?

Original change's description:
> Adds Desugar's jdk_libs_configuration to the build
> 
> This contains information required for new Java 8 desugaring features.
> 
> Bug: 1056751
> Change-Id: I87e15cd74f6a4a714fae748ed61172c000eda67c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354518
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Commit-Queue: Justin DeWitt <dewittj@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#798651}

TBR=yfriedman@chromium.org,dewittj@chromium.org,wnwen@chromium.org,agrieve@chromium.org,echristo@google.com

Change-Id: I21ea1a52845d3134339aa426e5699c452ac0e538
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1056751
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2358956Reviewed-by: default avataranthonyvd <anthonyvd@chromium.org>
Commit-Queue: anthonyvd <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798661}
parent 33cd6ce1
......@@ -2906,17 +2906,6 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration',
'version': 'version:0.11.1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine': {
'packages': [
{
......
......@@ -1128,13 +1128,6 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") {
]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("com_android_tools_desugar_jdk_libs_configuration_java") {
jar_path = "libs/com_android_tools_desugar_jdk_libs_configuration/desugar_jdk_libs_configuration-0.11.1.jar"
output_name = "com_android_tools_desugar_jdk_libs_configuration"
supports_android = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_auth_java") {
aar_path = "libs/com_google_android_gms_play_services_auth/play-services-auth-17.0.0.aar"
......
......@@ -118,7 +118,6 @@
"libs/com_android_tools_build_jetifier_jetifier_core",
"libs/com_android_tools_build_jetifier_jetifier_processor",
"libs/com_android_tools_desugar_jdk_libs",
"libs/com_android_tools_desugar_jdk_libs_configuration",
"libs/com_github_ben_manes_caffeine_caffeine",
"libs/com_github_kevinstern_software_and_algorithms",
"libs/com_google_android_gms_play_services_auth",
......
......@@ -164,7 +164,6 @@ dependencies {
// Used by R8 to desugar library functions.
compile "com.android.tools:desugar_jdk_libs:1.0.5"
compile "com.android.tools:desugar_jdk_libs_configuration:0.11.1"
// buildCompile targets have supports_android = false.
buildCompile "com.google.guava:guava:27.0.1-jre"
......
......@@ -35,8 +35,8 @@ class ChromiumDepGraph {
licenseUrl: "https://raw.githubusercontent.com/google/desugar_jdk_libs/master/LICENSE",
generateTarget: false),
'com_android_tools_desugar_jdk_libs_configuration': new PropertyOverride(
licensePath: "licenses/desugar_jdk_libs_configuration.txt",
licenseName: "BSD 3-Clause"),
// Configuration stored in //third_party/r8.
exclude: true),
'backport_util_concurrent_backport_util_concurrent': new PropertyOverride(
licensePath: "licenses/CC01.0.txt",
licenseName: "CC0 1.0"),
......
Copyright (c) 2016, the R8 project authors.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
file://third_party/android_deps/OWNERS
\ No newline at end of file
Name: D8 configuration to desugar desugar_jdk_libs
Short Name: desugar_jdk_libs_configuration
URL: http://r8.googlesource.com/r8
Version: 0.11.1
License: BSD 3-Clause
License File: LICENSE
Security Critical: yes
Description:
D8 configuration to desugar desugar_jdk_libs.
Local Modifications:
No modifications.
# Copyright 2018 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:0.11.1-cr0
package: chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration
description: "D8 configuration to desugar desugar_jdk_libs"
data:
- file: desugar_jdk_libs_configuration-0.11.1.jar
Copyright (c) 2016, the R8 project authors.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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