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

Side by Side Diff: build/common.gypi

Issue 25666014: Remove the ENABLE_GPU #define and enable_gpu gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/common/gpu/gpu_channel.h » ('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 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 1047
1048 # Enable use of OpenMAX DL FFT routines. 1048 # Enable use of OpenMAX DL FFT routines.
1049 'use_openmax_dl_fft%': '<(use_openmax_dl_fft)', 1049 'use_openmax_dl_fft%': '<(use_openmax_dl_fft)',
1050 1050
1051 # Enable new NPDevice API. 1051 # Enable new NPDevice API.
1052 'enable_new_npdevice_api%': 0, 1052 'enable_new_npdevice_api%': 0,
1053 1053
1054 # Enable EGLImage support in OpenMAX 1054 # Enable EGLImage support in OpenMAX
1055 'enable_eglimage%': 1, 1055 'enable_eglimage%': 1,
1056 1056
1057 # Enable a variable used elsewhere throughout the GYP files to determine
1058 # whether to compile in the sources for the GPU plugin / process.
1059 'enable_gpu%': 1,
1060
1061 # .gyp files or targets should set chromium_code to 1 if they build 1057 # .gyp files or targets should set chromium_code to 1 if they build
1062 # Chromium-specific code, as opposed to external code. This variable is 1058 # Chromium-specific code, as opposed to external code. This variable is
1063 # used to control such things as the set of warnings to enable, and 1059 # used to control such things as the set of warnings to enable, and
1064 # whether warnings are treated as errors. 1060 # whether warnings are treated as errors.
1065 'chromium_code%': 0, 1061 'chromium_code%': 0,
1066 1062
1067 'release_valgrind_build%': 0, 1063 'release_valgrind_build%': 0,
1068 1064
1069 # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600 1065 # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600
1070 'enable_wexit_time_destructors%': 0, 1066 'enable_wexit_time_destructors%': 0,
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 # All Chrome builds have breakpad symbols, but only process the 1200 # All Chrome builds have breakpad symbols, but only process the
1205 # symbols from official builds. 1201 # symbols from official builds.
1206 ['(branding=="Chrome" and buildtype=="Official")', { 1202 ['(branding=="Chrome" and buildtype=="Official")', {
1207 'linux_dump_symbols%': 1, 1203 'linux_dump_symbols%': 1,
1208 }], 1204 }],
1209 ], 1205 ],
1210 }], # os_posix==1 and OS!="mac" and OS!="ios" 1206 }], # os_posix==1 and OS!="mac" and OS!="ios"
1211 ['OS=="ios"', { 1207 ['OS=="ios"', {
1212 'disable_nacl%': 1, 1208 'disable_nacl%': 1,
1213 'enable_background%': 0, 1209 'enable_background%': 0,
1214 'enable_gpu%': 0,
1215 'enable_task_manager%': 0, 1210 'enable_task_manager%': 0,
1216 'icu_use_data_file_flag%': 1, 1211 'icu_use_data_file_flag%': 1,
1217 'use_system_libxml%': 1, 1212 'use_system_libxml%': 1,
1218 'use_system_sqlite%': 1, 1213 'use_system_sqlite%': 1,
1219 'locales==': [ 1214 'locales==': [
1220 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX', 1215 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX',
1221 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb', 1216 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb',
1222 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 1217 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk',
1223 'vi', 'zh-CN', 'zh-TW', 1218 'vi', 'zh-CN', 'zh-TW',
1224 ], 1219 ],
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
2145 ['tracing_like_official_build!=0', { 2140 ['tracing_like_official_build!=0', {
2146 'defines': ['TRACING_IS_OFFICIAL_BUILD=1'], 2141 'defines': ['TRACING_IS_OFFICIAL_BUILD=1'],
2147 }], # tracing_like_official_build!=0 2142 }], # tracing_like_official_build!=0
2148 ['win_use_allocator_shim==0', { 2143 ['win_use_allocator_shim==0', {
2149 'conditions': [ 2144 'conditions': [
2150 ['OS=="win"', { 2145 ['OS=="win"', {
2151 'defines': ['NO_TCMALLOC'], 2146 'defines': ['NO_TCMALLOC'],
2152 }], 2147 }],
2153 ], 2148 ],
2154 }], 2149 }],
2155 ['enable_gpu==1', {
2156 'defines': [
2157 'ENABLE_GPU=1',
2158 ],
2159 }],
2160 ['use_openssl==1', { 2150 ['use_openssl==1', {
2161 'defines': [ 2151 'defines': [
2162 'USE_OPENSSL=1', 2152 'USE_OPENSSL=1',
2163 ], 2153 ],
2164 }], 2154 }],
2165 ['enable_eglimage==1', { 2155 ['enable_eglimage==1', {
2166 'defines': [ 2156 'defines': [
2167 'ENABLE_EGLIMAGE=1', 2157 'ENABLE_EGLIMAGE=1',
2168 ], 2158 ],
2169 }], 2159 }],
(...skipping 2572 matching lines...) Expand 10 before | Expand all | Expand 10 after
4742 # settings in target dicts. SYMROOT is a special case, because many other 4732 # settings in target dicts. SYMROOT is a special case, because many other
4743 # Xcode variables depend on it, including variables such as 4733 # Xcode variables depend on it, including variables such as
4744 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4745 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4746 # files to appear (when present) in the UI as actual files and not red 4736 # files to appear (when present) in the UI as actual files and not red
4747 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4748 # and therefore SYMROOT, needs to be set at the project level. 4738 # and therefore SYMROOT, needs to be set at the project level.
4749 'SYMROOT': '<(DEPTH)/xcodebuild', 4739 'SYMROOT': '<(DEPTH)/xcodebuild',
4750 }, 4740 },
4751 } 4741 }
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/gpu_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698