diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 22:18:05 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 22:18:05 +0000 |
| commit | 89ad59733f5ea7d54f99ca5ce49a716c54486ebc (patch) | |
| tree | e4b17ee25914b9f8d968b363cf262292c382cc51 /content/content.gyp | |
| parent | c4d8d38b76de0209e0065f6e5d74e70530721bd8 (diff) | |
| download | chromium_src-89ad59733f5ea7d54f99ca5ce49a716c54486ebc.zip chromium_src-89ad59733f5ea7d54f99ca5ce49a716c54486ebc.tar.gz chromium_src-89ad59733f5ea7d54f99ca5ce49a716c54486ebc.tar.bz2 | |
Fix downstream android webview build from r175537
guava and jsr305 libraries are already present in the downstream build,
just need to not use the upstream third_party version and modify the
build script
BUG=
TBR=torne@chromium.org
Android only build fix. Ran through android bots with compile step.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11822002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/content.gyp b/content/content.gyp index 913cadd..f295a4f 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -284,7 +284,6 @@ 'dependencies': [ '../base/base.gyp:base', '../net/net.gyp:net', - '../third_party/guava/guava.gyp:guava_javalib', '../ui/ui.gyp:ui_java', 'common_aidl', 'content_common', @@ -301,6 +300,7 @@ ['android_build_type == 0', { 'dependencies': [ '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', + '../third_party/guava/guava.gyp:guava_javalib', ], }], ], |