summaryrefslogtreecommitdiffstats
path: root/third_party/guava
diff options
context:
space:
mode:
authornyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 17:19:56 +0000
committernyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 17:19:56 +0000
commitb62af60dda97ac8e505ecdceec5e0d1cc47560f7 (patch)
treeba62334003b9b604e16e9ed569fb0cad174ea599 /third_party/guava
parent9f12391e44f354363f7289d1cb0b8c3740b52539 (diff)
downloadchromium_src-b62af60dda97ac8e505ecdceec5e0d1cc47560f7.zip
chromium_src-b62af60dda97ac8e505ecdceec5e0d1cc47560f7.tar.gz
chromium_src-b62af60dda97ac8e505ecdceec5e0d1cc47560f7.tar.bz2
Add guava and jsr-305 to third_party for Android
Instead of using bundled versions of guava, we now instead build guava ourselves. Also, we need to build jsr-305 as it is the only dependency guava has. BUG=159873 Review URL: https://codereview.chromium.org/11415141 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/guava')
-rw-r--r--third_party/guava/README.chromium15
-rw-r--r--third_party/guava/guava.gyp20
2 files changed, 35 insertions, 0 deletions
diff --git a/third_party/guava/README.chromium b/third_party/guava/README.chromium
new file mode 100644
index 0000000..08ee9fc
--- /dev/null
+++ b/third_party/guava/README.chromium
@@ -0,0 +1,15 @@
+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
+License: Apache 2.0
+License File: src/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.
+
+Local Modifications:
+None.
diff --git a/third_party/guava/guava.gyp b/third_party/guava/guava.gyp
new file mode 100644
index 0000000..2a0b983
--- /dev/null
+++ b/third_party/guava/guava.gyp
@@ -0,0 +1,20 @@
+# 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': {
+ 'package_name': '<(_target_name)',
+ 'java_in_dir': 'src/guava',
+ },
+ 'dependencies': [
+ '../../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
+ ],
+ 'includes': [ '../../build/java.gypi' ],
+ },
+ ],
+}