diff options
| author | clamy <clamy@chromium.org> | 2016-02-19 06:42:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-19 14:43:14 +0000 |
| commit | 5f5cab50b44307c6ce1fde3d1a7b13be913d3304 (patch) | |
| tree | ca815bf4b43372f3416e96eb0f595c41cc644045 /media/media.gyp | |
| parent | b7b11b629858f322c3de1ae9478d74a64f9d4820 (diff) | |
| download | chromium_src-5f5cab50b44307c6ce1fde3d1a7b13be913d3304.zip chromium_src-5f5cab50b44307c6ce1fde3d1a7b13be913d3304.tar.gz chromium_src-5f5cab50b44307c6ce1fde3d1a7b13be913d3304.tar.bz2 | |
Revert of Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/... (patchset #2 id:70001 of https://codereview.chromium.org/1705333003/ )
Reason for revert:
Android WebView tests started failing after 4 CLs landed including this one, and it seems like the most likely culprit. See https://build.chromium.org/p/chromium.android/builders/Android%20Webview%20L%20%28dbg%29/builds/9568 and https://build.chromium.org/p/chromium.android/builders/Android%20Webview%20M%20%28dbg%29/builds/5214.
Original issue's description:
> Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/...
>
> ** No code changes (except git cl format kicked by presbumit). **
>
> This CL refactors the VideoCapture*java classes
> from being under media/base/android/java/... into
> media/capture/video/android/java/... with the idea
> of bringing all such classes under a single roof
> as a preparation for http://crbug.com/584797 (CL
> http://crrev.com/1699553002) which creates an entity
> (very similar to media/cast/ and media/midi/) with
> its own .gn and .gyp.
>
> BUG=587693, 584797
> NOTRY=true
>
> Committed: https://crrev.com/157c17e6d77e64efee6b82947506f544aac3b79f
> Cr-Commit-Position: refs/heads/master@{#376409}
TBR=qinmin@chromium.org,dalecurtis@chromium.org,avi@chromium.org,dtrainor@chromium.org,mcasas@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=587693, 584797
Review URL: https://codereview.chromium.org/1710373002
Cr-Commit-Position: refs/heads/master@{#376438}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/media.gyp b/media/media.gyp index 79f97b4..638f9e8 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1866,8 +1866,8 @@ 'target_name': 'video_capture_android_jni_headers', 'type': 'none', 'sources': [ - 'capture/video/android/java/src/org/chromium/media/VideoCapture.java', - 'capture/video/android/java/src/org/chromium/media/VideoCaptureFactory.java', + 'base/android/java/src/org/chromium/media/VideoCapture.java', + 'base/android/java/src/org/chromium/media/VideoCaptureFactory.java', ], 'variables': { 'jni_gen_package': 'media', @@ -1972,7 +1972,7 @@ '../base/base.gyp:base', ], 'variables': { - 'java_in_dir': 'capture/video/android/java', + 'java_in_dir': 'base/android/java', }, 'includes': ['../build/java.gypi'], }, |