diff options
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 14 | ||||
| -rw-r--r-- | third_party/guava/README.chromium | 15 | ||||
| -rw-r--r-- | third_party/guava/guava.gyp | 20 | ||||
| -rw-r--r-- | third_party/jsr-305/README.chromium | 16 | ||||
| -rw-r--r-- | third_party/jsr-305/jsr-305.gyp | 20 |
5 files changed, 72 insertions, 13 deletions
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index 84aeb96..c722dc5 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -195,8 +195,8 @@ 'type': 'none', 'dependencies': [ '../../third_party/android_tools/android_tools.gyp:android_gcm', + '../../third_party/guava/guava.gyp:guava_javalib', 'cacheinvalidation_aidl_javalib', - 'cacheinvalidation_guava_javalib', 'cacheinvalidation_proto_java', ], 'variables': { @@ -221,18 +221,6 @@ ], 'includes': [ '../../build/java_aidl.gypi' ], }, - # TODO(nyquist): Depend on guava from third_party/guava. See http://crbug.com/159873. - { - 'target_name': 'cacheinvalidation_guava_javalib', - 'type' : 'none', - 'all_dependent_settings': { - 'variables': { - 'input_jars_paths' : [ - 'src/example-app-build/libs/guava-13.0.1.jar', - ], - } - } - }, ], }], ], 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' ], + }, + ], +} diff --git a/third_party/jsr-305/README.chromium b/third_party/jsr-305/README.chromium new file mode 100644 index 0000000..cecbc52 --- /dev/null +++ b/third_party/jsr-305/README.chromium @@ -0,0 +1,16 @@ +Name: JSR 305: Annotations for Software Defect Detection in Java +Short Name: jsr-305 +URL: https://code.google.com/p/jsr-305/ +Version: r51 +License: BSD 2-Clause License +License File: src/ri/LICENSE +Security Critical: no + +Description: +This project contains reference implementations, test cases, and other +documents under source code control for Java Specification Request 305: +Annotations for Software Defect Detection. More information at the Google +group: http://groups.google.com/group/jsr-305 + +Local Modifications: +None. diff --git a/third_party/jsr-305/jsr-305.gyp b/third_party/jsr-305/jsr-305.gyp new file mode 100644 index 0000000..a51eded --- /dev/null +++ b/third_party/jsr-305/jsr-305.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': 'jsr_305_javalib', + 'type': 'none', + 'variables': { + 'package_name': '<(_target_name)', + # The sources are not located in a folder that is called src/, so we + # need to set it in additional_src_dirs parameter instead. + 'java_in_dir': '../../build/android/empty', + 'additional_src_dirs': [ 'src/ri/' ], + }, + 'includes': [ '../../build/java.gypi' ], + }, + ] +} |