OLD | NEW |
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 2752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2763 }], | 2763 }], |
2764 ['enable_webrtc==1', { | 2764 ['enable_webrtc==1', { |
2765 'defines': ['ENABLE_WEBRTC=1'], | 2765 'defines': ['ENABLE_WEBRTC=1'], |
2766 }], | 2766 }], |
2767 ['enable_media_router==1', { | 2767 ['enable_media_router==1', { |
2768 'defines': ['ENABLE_MEDIA_ROUTER=1'], | 2768 'defines': ['ENABLE_MEDIA_ROUTER=1'], |
2769 }], | 2769 }], |
2770 ['proprietary_codecs==1', { | 2770 ['proprietary_codecs==1', { |
2771 'defines': ['USE_PROPRIETARY_CODECS'], | 2771 'defines': ['USE_PROPRIETARY_CODECS'], |
2772 }], | 2772 }], |
| 2773 ['ffmpeg_branding=="Chromium"', { |
| 2774 'defines': ['FFMPEG_BRANDING_CHROMIUM'], |
| 2775 }], |
2773 ['enable_viewport==1', { | 2776 ['enable_viewport==1', { |
2774 'defines': ['ENABLE_VIEWPORT'], | 2777 'defines': ['ENABLE_VIEWPORT'], |
2775 }], | 2778 }], |
2776 ['enable_pepper_cdms==1', { | 2779 ['enable_pepper_cdms==1', { |
2777 'defines': ['ENABLE_PEPPER_CDMS'], | 2780 'defines': ['ENABLE_PEPPER_CDMS'], |
2778 }], | 2781 }], |
2779 ['enable_browser_cdms==1', { | 2782 ['enable_browser_cdms==1', { |
2780 'defines': ['ENABLE_BROWSER_CDMS'], | 2783 'defines': ['ENABLE_BROWSER_CDMS'], |
2781 }], | 2784 }], |
2782 ['configuration_policy==1', { | 2785 ['configuration_policy==1', { |
(...skipping 3614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6397 # settings in target dicts. SYMROOT is a special case, because many other | 6400 # settings in target dicts. SYMROOT is a special case, because many other |
6398 # Xcode variables depend on it, including variables such as | 6401 # Xcode variables depend on it, including variables such as |
6399 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6402 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6400 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6403 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6401 # files to appear (when present) in the UI as actual files and not red | 6404 # files to appear (when present) in the UI as actual files and not red |
6402 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6405 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6403 # and therefore SYMROOT, needs to be set at the project level. | 6406 # and therefore SYMROOT, needs to be set at the project level. |
6404 'SYMROOT': '<(DEPTH)/xcodebuild', | 6407 'SYMROOT': '<(DEPTH)/xcodebuild', |
6405 }, | 6408 }, |
6406 } | 6409 } |
OLD | NEW |