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

Side by Side Diff: build/common.gypi

Issue 110683002: Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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 | cc/layers/video_layer_impl.cc » ('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 2127 matching lines...) Expand 10 before | Expand all | Expand 10 after
2138 }], 2138 }],
2139 ['toolkit_uses_gtk==1 and toolkit_views==0', { 2139 ['toolkit_uses_gtk==1 and toolkit_views==0', {
2140 # TODO(erg): We are progressively sealing up use of deprecated features 2140 # TODO(erg): We are progressively sealing up use of deprecated features
2141 # in gtk in preparation for an eventual porting to gtk3. 2141 # in gtk in preparation for an eventual porting to gtk3.
2142 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 2142 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
2143 }], 2143 }],
2144 ['chromeos==1', { 2144 ['chromeos==1', {
2145 'defines': ['OS_CHROMEOS=1'], 2145 'defines': ['OS_CHROMEOS=1'],
2146 }], 2146 }],
2147 ['google_tv==1', { 2147 ['google_tv==1', {
2148 'defines': ['GOOGLE_TV=1'], 2148 'defines': [
2149 'GOOGLE_TV=1',
2150 'VIDEO_HOLE=1',
2151 ],
2149 }], 2152 }],
2150 ['use_xi2_mt!=0 and use_x11==1', { 2153 ['use_xi2_mt!=0 and use_x11==1', {
2151 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], 2154 'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
2152 }], 2155 }],
2153 ['file_manager_extension==1', { 2156 ['file_manager_extension==1', {
2154 'defines': ['FILE_MANAGER_EXTENSION=1'], 2157 'defines': ['FILE_MANAGER_EXTENSION=1'],
2155 }], 2158 }],
2156 ['image_loader_extension==1', { 2159 ['image_loader_extension==1', {
2157 'defines': ['IMAGE_LOADER_EXTENSION=1'], 2160 'defines': ['IMAGE_LOADER_EXTENSION=1'],
2158 }], 2161 }],
(...skipping 2648 matching lines...) Expand 10 before | Expand all | Expand 10 after
4807 # settings in target dicts. SYMROOT is a special case, because many other 4810 # settings in target dicts. SYMROOT is a special case, because many other
4808 # Xcode variables depend on it, including variables such as 4811 # Xcode variables depend on it, including variables such as
4809 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4812 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4810 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4813 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4811 # files to appear (when present) in the UI as actual files and not red 4814 # files to appear (when present) in the UI as actual files and not red
4812 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4815 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4813 # and therefore SYMROOT, needs to be set at the project level. 4816 # and therefore SYMROOT, needs to be set at the project level.
4814 'SYMROOT': '<(DEPTH)/xcodebuild', 4817 'SYMROOT': '<(DEPTH)/xcodebuild',
4815 }, 4818 },
4816 } 4819 }
OLDNEW
« no previous file with comments | « no previous file | cc/layers/video_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698