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

Side by Side Diff: media/media.gyp

Issue 1014943005: Android CaptureAPI Types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed android_webview changes. Created 5 years, 9 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
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 1804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1815 'defines': [ 1815 'defines': [
1816 'MEDIA_IMPLEMENTATION', 1816 'MEDIA_IMPLEMENTATION',
1817 ], 1817 ],
1818 }, 1818 },
1819 { 1819 {
1820 # GN: //media/base/android:media_java 1820 # GN: //media/base/android:media_java
1821 'target_name': 'media_java', 1821 'target_name': 'media_java',
1822 'type': 'none', 1822 'type': 'none',
1823 'dependencies': [ 1823 'dependencies': [
1824 '../base/base.gyp:base', 1824 '../base/base.gyp:base',
1825 'media_android_captureapitype',
1825 'media_android_imageformat', 1826 'media_android_imageformat',
1826 ], 1827 ],
1827 'export_dependent_settings': [ 1828 'export_dependent_settings': [
1828 '../base/base.gyp:base', 1829 '../base/base.gyp:base',
1829 ], 1830 ],
1830 'variables': { 1831 'variables': {
1831 'java_in_dir': 'base/android/java', 1832 'java_in_dir': 'base/android/java',
1832 }, 1833 },
1833 'includes': ['../build/java.gypi'], 1834 'includes': ['../build/java.gypi'],
1834 }, 1835 },
1835 { 1836 {
1837 # GN: //media/base/android:media_android_captureapitype
1838 'target_name': 'media_android_captureapitype',
1839 'type': 'none',
1840 'variables': {
1841 'source_file': 'video/capture/video_capture_device.h',
1842 },
1843 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1844 },
1845 {
1836 # GN: //media/base/android:media_android_imageformat 1846 # GN: //media/base/android:media_android_imageformat
1837 'target_name': 'media_android_imageformat', 1847 'target_name': 'media_android_imageformat',
1838 'type': 'none', 1848 'type': 'none',
1839 'variables': { 1849 'variables': {
1840 'source_file': 'video/capture/android/video_capture_device_android.h ', 1850 'source_file': 'video/capture/android/video_capture_device_android.h ',
1841 }, 1851 },
1842 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1852 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1843 }, 1853 },
1844 ], 1854 ],
1845 }], 1855 }],
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 '../build/isolate.gypi', 1966 '../build/isolate.gypi',
1957 ], 1967 ],
1958 'sources': [ 1968 'sources': [
1959 'media_unittests.isolate', 1969 'media_unittests.isolate',
1960 ], 1970 ],
1961 }, 1971 },
1962 ], 1972 ],
1963 }], 1973 }],
1964 ], 1974 ],
1965 } 1975 }
OLDNEW
« no previous file with comments | « media/base/android/java/src/org/chromium/media/VideoCaptureTango.java ('k') | media/video/capture/android/imageformat_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698