diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-02 01:51:17 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-02 01:51:17 +0000 |
| commit | a38cadebe7e452d71de82200fd0ebbe50482dd42 (patch) | |
| tree | f10c1ca1ad8c58ddc528a90ef4877e45a232740f /base | |
| parent | 96f0e9e2b49168ef28539e7381780891a8cc9c09 (diff) | |
| download | chromium_src-a38cadebe7e452d71de82200fd0ebbe50482dd42.zip chromium_src-a38cadebe7e452d71de82200fd0ebbe50482dd42.tar.gz chromium_src-a38cadebe7e452d71de82200fd0ebbe50482dd42.tar.bz2 | |
Fix downstream android webview build
New jsr-305 dependency introduced in r185595
Android webview does not merge third_party/jsr-305 and uses the system copy instead.
This change should not affect any upstream build since android_build_type is always 0.
TBR=mark@chromium.org
NOTRY=true
BUG=
Review URL: https://chromiumcodereview.appspot.com/12385066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/base/base.gyp b/base/base.gyp index aa753c0..f75c7c2 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1119,13 +1119,17 @@ { 'target_name': 'base_java', 'type': 'none', - 'dependencies': [ - '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', - ], 'variables': { 'java_in_dir': '../base/android/java', }, 'includes': [ '../build/java.gypi' ], + 'conditions': [ + ['android_build_type==0', { + 'dependencies': [ + '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', + ], + }] + ], }, { 'target_name': 'base_java_test_support', |