Commit e1aebb59 authored by nyquist's avatar nyquist Committed by Commit bot

Remove guava from chromium.

This removes the rest of guava from a chromium checkout.

It also removes a workaround in build/android/gyp/javac.py
which sorts input files for javac. The issue was fixed in guava 14
(https://code.google.com/p/guava-libraries/issues/detail?id=950),
but it was never rolled in to chromium.

The last remaining files in third_party/guava are left because
some bots do not delete non-existing DEPS. COPYING is a copy of the
current version of the COPYING file from the guava repository.
See http://crbug.com/380688 for details about the DEPS issue.

BUG=412673

Review URL: https://codereview.chromium.org/574103002

Cr-Commit-Position: refs/heads/master@{#296202}
parent a21168de
......@@ -259,7 +259,6 @@ v8.log
/third_party/google_toolbox_for_mac/src
/third_party/googlemac
/third_party/gperf
/third_party/guava/src
/third_party/httpcomponents-client
/third_party/httpcomponents-core
/third_party/hunspell
......
......@@ -169,7 +169,6 @@ group("root") {
"//third_party/openmax_dl/dl",
"//content/shell/android:content_shell_apk",
"//ui/android:ui_java",
"//third_party/guava:guava_javalib",
"//third_party/android_tools:android_gcm_java",
"//third_party/android_tools:uiautomator_java",
"//third_party/android_tools:android_support_v13_java",
......
......@@ -477,9 +477,6 @@ deps_os = {
'src/third_party/freetype':
Var('chromium_git') + '/chromium/src/third_party/freetype.git' + '@' + 'a2b9955b49034a51dfbc8bf9f4e9d312149cecac',
'src/third_party/guava/src':
Var('chromium_git') + '/external/guava-libraries.git' + '@' + 'c523556ab7d0f05afadebd20e7768d4c16af8771',
'src/third_party/elfutils/src':
Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
......
......@@ -62,13 +62,6 @@ def DoJavac(
checking will be enabled.
"""
# Compiling guava with certain orderings of input files causes a compiler
# crash... Sorted order works, so use that.
# See https://code.google.com/p/guava-libraries/issues/detail?id=950
# TODO(cjhopman): Remove this when we have update guava or the compiler to a
# version without this problem.
java_files.sort()
jar_inputs = []
for path in classpath:
if os.path.exists(path + '.TOC'):
......
This diff is collapsed.
This diff is collapsed.
Name: Guava: Google Core Libraries for Java 1.6+
Short Name: guava-libraries
URL: https://code.google.com/p/guava-libraries/
Version: v13.0.1
Version: NONE
License: Apache 2.0
License File: src/COPYING
License File: COPYING
Security Critical: no
Description:
The Guava project contains several of Google's core libraries that we rely on
in our Java-based projects: collections, caching, primitives support,
concurrency libraries, common annotations, string processing, I/O, and so forth.
The Guava project contains several of Google's core libraries.
This file and the COPYING license file are currently just a placeholders,
as guava was removed in: https://codereview.chromium.org/574103002/.
Because DEPS are not automatically removed on all bots, this file needs to stay
around until they do, to make the android_aosp bot happy, since it has a
requirement for license information for all directories in third_party. The
current COPYING file is a copy of the one from the guava repository.
See http://crbug.com/380688 for details.
TODO(nyquist): Remove this file when http://crbug.com/380688 has been fixed.
Local Modifications:
None.
# Copyright (c) 2012 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.
{
'targets': [
{
'target_name': 'guava_javalib',
'type': 'none',
'variables': {
'java_in_dir': 'src/guava',
'proguard_preprocess': 1,
'proguard_config': 'proguard.flags',
},
'dependencies': [
'../../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
],
'includes': [ '../../build/java.gypi' ],
},
],
}
# Copyright 2013 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.
-keep class com.google.common.annotations.VisibleForTesting,
com.google.common.base.Preconditions,
com.google.common.base.Objects,
com.google.common.base.Strings,
com.google.common.base.Supplier {
*;
}
-keepattributes Signature
# Don't complain about usage of sun.misc.Unsafe. Guava imports this,
# but does not use it unless it exists.
# The gyp-target that uses this is guava.gyp:guava_javalib.
-dontwarn sun.misc.Unsafe
# Striped64 uses reflection to access some local fields.
-dontnote com.google.common.cache.Striped64
-dontnote com.google.common.cache.Striped64$Cell
# Keep all enum values and valueOf methods. See
# http://proguard.sourceforge.net/index.html#manual/examples.html
# for the reason for this. Also, see http://crbug.com/248037.
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
# Keep finalizer stuff from google-common used via reflection
-keepclassmembers class com.google.common.** {
*** finalizeReferent();
}
-keepclassmembers class com.google.common.** {
*** startFinalizer(java.lang.Class,java.lang.Object);
}
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