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

Side by Side Diff: build/common.gypi

Issue 1133163002: Removing unused ffmpeg variable from common.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1804 1804
1805 # Android does not support background apps. 1805 # Android does not support background apps.
1806 'enable_background%': 0, 1806 'enable_background%': 0,
1807 1807
1808 # Sessions are store separately in the Java side. 1808 # Sessions are store separately in the Java side.
1809 'enable_session_service%': 0, 1809 'enable_session_service%': 0,
1810 1810
1811 'p2p_apis%' : 0, 1811 'p2p_apis%' : 0,
1812 1812
1813 'gtest_target_type%': 'shared_library', 1813 'gtest_target_type%': 'shared_library',
1814
1815 # Uses system APIs for decoding audio and video.
1816 'use_libffmpeg%': '0',
1817 }], # OS=="android" 1814 }], # OS=="android"
1818 ['embedded==1', { 1815 ['embedded==1', {
1819 'use_system_fontconfig%': 0, 1816 'use_system_fontconfig%': 0,
1820 }, { 1817 }, {
1821 'use_system_fontconfig%': 1, 1818 'use_system_fontconfig%': 1,
1822 }], 1819 }],
1823 ['chromecast==1', { 1820 ['chromecast==1', {
1824 'enable_mpeg2ts_stream_parser%': 1, 1821 'enable_mpeg2ts_stream_parser%': 1,
1825 'ffmpeg_branding%': 'ChromeOS', 1822 'ffmpeg_branding%': 'ChromeOS',
1826 'ozone_platform_ozonex%': 1, 1823 'ozone_platform_ozonex%': 1,
(...skipping 4360 matching lines...) Expand 10 before | Expand all | Expand 10 after
6187 # settings in target dicts. SYMROOT is a special case, because many other 6184 # settings in target dicts. SYMROOT is a special case, because many other
6188 # Xcode variables depend on it, including variables such as 6185 # Xcode variables depend on it, including variables such as
6189 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6186 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6190 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6187 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6191 # files to appear (when present) in the UI as actual files and not red 6188 # files to appear (when present) in the UI as actual files and not red
6192 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6189 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6193 # and therefore SYMROOT, needs to be set at the project level. 6190 # and therefore SYMROOT, needs to be set at the project level.
6194 'SYMROOT': '<(DEPTH)/xcodebuild', 6191 'SYMROOT': '<(DEPTH)/xcodebuild',
6195 }, 6192 },
6196 } 6193 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698