Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(916)

Side by Side Diff: media/media.gyp

Issue 1705333003: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reuploaded w --similarity=75 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/capture/video/android/java/src/org/chromium/media/VideoCaptureTango.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1852 matching lines...) Expand 10 before | Expand all | Expand 10 after
1863 'variables': { 1863 'variables': {
1864 'jni_gen_package': 'media', 1864 'jni_gen_package': 'media',
1865 }, 1865 },
1866 'includes': ['../build/jni_generator.gypi'], 1866 'includes': ['../build/jni_generator.gypi'],
1867 }, 1867 },
1868 { 1868 {
1869 # GN: //media/base/android:video_capture_android_jni_headers 1869 # GN: //media/base/android:video_capture_android_jni_headers
1870 'target_name': 'video_capture_android_jni_headers', 1870 'target_name': 'video_capture_android_jni_headers',
1871 'type': 'none', 1871 'type': 'none',
1872 'sources': [ 1872 'sources': [
1873 'base/android/java/src/org/chromium/media/VideoCapture.java', 1873 'capture/video/android/java/src/org/chromium/media/VideoCapture.java ',
1874 'base/android/java/src/org/chromium/media/VideoCaptureFactory.java', 1874 'capture/video/android/java/src/org/chromium/media/VideoCaptureFacto ry.java',
1875 ], 1875 ],
1876 'variables': { 1876 'variables': {
1877 'jni_gen_package': 'media', 1877 'jni_gen_package': 'media',
1878 }, 1878 },
1879 'includes': ['../build/jni_generator.gypi'], 1879 'includes': ['../build/jni_generator.gypi'],
1880 }, 1880 },
1881 { 1881 {
1882 # GN: //media/base/android:android 1882 # GN: //media/base/android:android
1883 'target_name': 'player_android', 1883 'target_name': 'player_android',
1884 'type': 'static_library', 1884 'type': 'static_library',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
1969 'type': 'none', 1969 'type': 'none',
1970 'dependencies': [ 1970 'dependencies': [
1971 '../base/base.gyp:base', 1971 '../base/base.gyp:base',
1972 'media_android_captureapitype', 1972 'media_android_captureapitype',
1973 'media_android_imageformat', 1973 'media_android_imageformat',
1974 ], 1974 ],
1975 'export_dependent_settings': [ 1975 'export_dependent_settings': [
1976 '../base/base.gyp:base', 1976 '../base/base.gyp:base',
1977 ], 1977 ],
1978 'variables': { 1978 'variables': {
1979 'java_in_dir': 'base/android/java', 1979 'java_in_dir': 'capture/video/android/java',
1980 }, 1980 },
1981 'includes': ['../build/java.gypi'], 1981 'includes': ['../build/java.gypi'],
1982 }, 1982 },
1983 { 1983 {
1984 # GN: //media/base/android:media_android_captureapitype 1984 # GN: //media/base/android:media_android_captureapitype
1985 'target_name': 'media_android_captureapitype', 1985 'target_name': 'media_android_captureapitype',
1986 'type': 'none', 1986 'type': 'none',
1987 'variables': { 1987 'variables': {
1988 'source_file': 'capture/video/video_capture_device.h', 1988 'source_file': 'capture/video/video_capture_device.h',
1989 }, 1989 },
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
2164 'dependencies': [ 2164 'dependencies': [
2165 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2165 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2166 ], 2166 ],
2167 }], 2167 }],
2168 ], 2168 ],
2169 }, 2169 },
2170 ], 2170 ],
2171 }], 2171 }],
2172 ], 2172 ],
2173 } 2173 }
OLDNEW
« no previous file with comments | « media/capture/video/android/java/src/org/chromium/media/VideoCaptureTango.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698