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

Side by Side Diff: media/media.gyp

Issue 606343003: Rename AndroidImage format template to match the Java class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix webview build Created 6 years, 2 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/base/android/java/src/org/chromium/media/VideoCaptureAndroid.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 1804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1815 'variables': { 1815 'variables': {
1816 'java_in_dir': 'base/android/java', 1816 'java_in_dir': 'base/android/java',
1817 }, 1817 },
1818 'includes': ['../build/java.gypi'], 1818 'includes': ['../build/java.gypi'],
1819 }, 1819 },
1820 { 1820 {
1821 # GN: //media/base/android:media_android_imageformat_list 1821 # GN: //media/base/android:media_android_imageformat_list
1822 'target_name': 'media_android_imageformat_list', 1822 'target_name': 'media_android_imageformat_list',
1823 'type': 'none', 1823 'type': 'none',
1824 'sources': [ 1824 'sources': [
1825 'base/android/java/src/org/chromium/media/ImageFormat.template', 1825 'base/android/java/src/org/chromium/media/AndroidImageFormat.templat e',
1826 ], 1826 ],
1827 'variables': { 1827 'variables': {
1828 'package_name': 'org/chromium/media', 1828 'package_name': 'org/chromium/media',
1829 'template_deps': ['video/capture/android/imageformat_list.h'], 1829 'template_deps': ['video/capture/android/imageformat_list.h'],
1830 }, 1830 },
1831 'includes': [ '../build/android/java_cpp_template.gypi' ], 1831 'includes': [ '../build/android/java_cpp_template.gypi' ],
1832 }, 1832 },
1833 ], 1833 ],
1834 }], 1834 }],
1835 ['media_use_ffmpeg==1', { 1835 ['media_use_ffmpeg==1', {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1939 ['include', '^base/mac/videotoolbox_glue\\.h$'], 1939 ['include', '^base/mac/videotoolbox_glue\\.h$'],
1940 ['include', '^base/mac/videotoolbox_glue\\.mm$'], 1940 ['include', '^base/mac/videotoolbox_glue\\.mm$'],
1941 ], 1941 ],
1942 }], 1942 }],
1943 ], # target_conditions 1943 ], # target_conditions
1944 }, 1944 },
1945 ], 1945 ],
1946 }], 1946 }],
1947 ], 1947 ],
1948 } 1948 }
OLDNEW
« no previous file with comments | « media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698