diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 11:00:34 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 11:00:34 +0000 |
| commit | 6e277d09f8c5a4d752c2673ae3455ba2ac07b831 (patch) | |
| tree | dbef27bec70183d64509cfee11ab6bf46215b991 | |
| parent | a2b85426cb46dd9ad5ad1f06f6c2c4d61db696b7 (diff) | |
| download | chromium_src-6e277d09f8c5a4d752c2673ae3455ba2ac07b831.zip chromium_src-6e277d09f8c5a4d752c2673ae3455ba2ac07b831.tar.gz chromium_src-6e277d09f8c5a4d752c2673ae3455ba2ac07b831.tar.bz2 | |
Fix 'media' dependency on Java for the Android WebView case
There should be no explicit dependencies on Java targets
when Android is built in the 'android_webview_build' mode.
TBR=shadi@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/13820007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193081 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/media.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index ee9524d..3007e20 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -573,10 +573,16 @@ ], 'dependencies': [ 'media_android_jni_headers', - 'media_java', 'player_android', 'video_capture_android_jni_headers', ], + 'conditions': [ + ['android_webview_build == 0', { + 'dependencies': [ + 'media_java', + ], + }], + ] }], # A simple WebM encoder for animated avatars on ChromeOS. ['chromeos==1', { |