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

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: Added MediaInternalsVideoCaptureDeviceTest.* 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 1794 matching lines...) Expand 10 before | Expand all | Expand 10 after
1805 'defines': [ 1805 'defines': [
1806 'MEDIA_IMPLEMENTATION', 1806 'MEDIA_IMPLEMENTATION',
1807 ], 1807 ],
1808 }, 1808 },
1809 { 1809 {
1810 # GN: //media/base/android:media_java 1810 # GN: //media/base/android:media_java
1811 'target_name': 'media_java', 1811 'target_name': 'media_java',
1812 'type': 'none', 1812 'type': 'none',
1813 'dependencies': [ 1813 'dependencies': [
1814 '../base/base.gyp:base', 1814 '../base/base.gyp:base',
1815 'media_android_capturapitype',
mcasas 2015/03/19 01:55:14 Re. my comments about the typo, missing "e".
emircan 2015/03/19 19:52:23 Done.
1815 'media_android_imageformat', 1816 'media_android_imageformat',
1816 ], 1817 ],
1817 'export_dependent_settings': [ 1818 'export_dependent_settings': [
1818 '../base/base.gyp:base', 1819 '../base/base.gyp:base',
1819 ], 1820 ],
1820 'variables': { 1821 'variables': {
1821 'java_in_dir': 'base/android/java', 1822 'java_in_dir': 'base/android/java',
1822 }, 1823 },
1823 'includes': ['../build/java.gypi'], 1824 'includes': ['../build/java.gypi'],
1824 }, 1825 },
1825 { 1826 {
1827 # GN: //media/base/android:media_android_capturapitype
1828 'target_name': 'media_android_capturapitype',
1829 'type': 'none',
1830 'variables': {
1831 'source_file': 'video/capture/video_capture_device.h',
1832 },
1833 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1834 },
1835 {
1826 # GN: //media/base/android:media_android_imageformat 1836 # GN: //media/base/android:media_android_imageformat
1827 'target_name': 'media_android_imageformat', 1837 'target_name': 'media_android_imageformat',
1828 'type': 'none', 1838 'type': 'none',
1829 'variables': { 1839 'variables': {
1830 'source_file': 'video/capture/android/video_capture_device_android.h ', 1840 'source_file': 'video/capture/android/video_capture_device_android.h ',
1831 }, 1841 },
1832 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1842 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1833 }, 1843 },
1834 ], 1844 ],
1835 }], 1845 }],
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1946 '../build/isolate.gypi', 1956 '../build/isolate.gypi',
1947 ], 1957 ],
1948 'sources': [ 1958 'sources': [
1949 'media_unittests.isolate', 1959 'media_unittests.isolate',
1950 ], 1960 ],
1951 }, 1961 },
1952 ], 1962 ],
1953 }], 1963 }],
1954 ], 1964 ],
1955 } 1965 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698