diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 17:19:56 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 17:19:56 +0000 |
| commit | b62af60dda97ac8e505ecdceec5e0d1cc47560f7 (patch) | |
| tree | ba62334003b9b604e16e9ed569fb0cad174ea599 /third_party/cacheinvalidation/cacheinvalidation.gyp | |
| parent | 9f12391e44f354363f7289d1cb0b8c3740b52539 (diff) | |
| download | chromium_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/cacheinvalidation/cacheinvalidation.gyp')
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 14 |
1 files changed, 1 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', - ], - } - } - }, ], }], ], |