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

Side by Side Diff: build/common.gypi

Issue 478043005: Add the mp2t mimetype to the list of supported mime types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments from patch set #1. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | 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 2571 matching lines...) Expand 10 before | Expand all | Expand 10 after
2582 'defines': ['ENABLE_PROFILING=1'], 2582 'defines': ['ENABLE_PROFILING=1'],
2583 }], 2583 }],
2584 ['remoting==1', { 2584 ['remoting==1', {
2585 'defines': ['ENABLE_REMOTING=1'], 2585 'defines': ['ENABLE_REMOTING=1'],
2586 }], 2586 }],
2587 ['enable_webrtc==1', { 2587 ['enable_webrtc==1', {
2588 'defines': ['ENABLE_WEBRTC=1'], 2588 'defines': ['ENABLE_WEBRTC=1'],
2589 }], 2589 }],
2590 ['proprietary_codecs==1', { 2590 ['proprietary_codecs==1', {
2591 'defines': ['USE_PROPRIETARY_CODECS'], 2591 'defines': ['USE_PROPRIETARY_CODECS'],
2592 'conditions': [
2593 ['enable_mpeg2ts_stream_parser==1', {
2594 'defines': ['ENABLE_MPEG2TS_STREAM_PARSER'],
2595 }],
2596 ],
2592 }], 2597 }],
2593 ['enable_viewport==1', { 2598 ['enable_viewport==1', {
2594 'defines': ['ENABLE_VIEWPORT'], 2599 'defines': ['ENABLE_VIEWPORT'],
2595 }], 2600 }],
2596 ['enable_pepper_cdms==1', { 2601 ['enable_pepper_cdms==1', {
2597 'defines': ['ENABLE_PEPPER_CDMS'], 2602 'defines': ['ENABLE_PEPPER_CDMS'],
2598 }], 2603 }],
2599 ['enable_browser_cdms==1', { 2604 ['enable_browser_cdms==1', {
2600 'defines': ['ENABLE_BROWSER_CDMS'], 2605 'defines': ['ENABLE_BROWSER_CDMS'],
2601 }], 2606 }],
(...skipping 3102 matching lines...) Expand 10 before | Expand all | Expand 10 after
5704 # settings in target dicts. SYMROOT is a special case, because many other 5709 # settings in target dicts. SYMROOT is a special case, because many other
5705 # Xcode variables depend on it, including variables such as 5710 # Xcode variables depend on it, including variables such as
5706 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5711 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5707 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5712 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5708 # files to appear (when present) in the UI as actual files and not red 5713 # files to appear (when present) in the UI as actual files and not red
5709 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5714 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5710 # and therefore SYMROOT, needs to be set at the project level. 5715 # and therefore SYMROOT, needs to be set at the project level.
5711 'SYMROOT': '<(DEPTH)/xcodebuild', 5716 'SYMROOT': '<(DEPTH)/xcodebuild',
5712 }, 5717 },
5713 } 5718 }
OLDNEW
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698