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

Side by Side Diff: build/common.gypi

Issue 525022: Revert 35509 - linux: implement gpu plugin... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 11 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 | chrome/chrome.gyp » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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': { 9 'variables': {
10 # .gyp files should set chromium_code to 1 if they build Chromium-specific 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 # {'variables': {'library': 'shared_library'}} 141 # {'variables': {'library': 'shared_library'}}
142 # to compile as shared by default 142 # to compile as shared by default
143 'library%': 'static_library', 143 'library%': 'static_library',
144 144
145 # The Google Update appid. 145 # The Google Update appid.
146 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}', 146 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
147 147
148 # Whether to add the experimental build define. 148 # Whether to add the experimental build define.
149 'chrome_frame_define%': 0, 149 'chrome_frame_define%': 0,
150 150
151 # Whether GPU plugin build is enabled.
152 'enable_gpu%': 0,
153
151 # Whether usage of OpenMAX is enabled. 154 # Whether usage of OpenMAX is enabled.
152 'enable_openmax%': 0, 155 'enable_openmax%': 0,
153 156
154 # TODO(bradnelson): eliminate this when possible. 157 # TODO(bradnelson): eliminate this when possible.
155 # To allow local gyp files to prevent release.vsprops from being included. 158 # To allow local gyp files to prevent release.vsprops from being included.
156 # Yes(1) means include release.vsprops. 159 # Yes(1) means include release.vsprops.
157 # Once all vsprops settings are migrated into gyp, this can go away. 160 # Once all vsprops settings are migrated into gyp, this can go away.
158 'msvs_use_common_release%': 1, 161 'msvs_use_common_release%': 1,
159 162
160 # TODO(bradnelson): eliminate this when possible. 163 # TODO(bradnelson): eliminate this when possible.
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 ['selinux==1', { 342 ['selinux==1', {
340 'defines': ['CHROMIUM_SELINUX=1'], 343 'defines': ['CHROMIUM_SELINUX=1'],
341 }], 344 }],
342 ['win_use_allocator_shim==0', { 345 ['win_use_allocator_shim==0', {
343 'conditions': [ 346 'conditions': [
344 ['OS=="win"', { 347 ['OS=="win"', {
345 'defines': ['NO_TCMALLOC'], 348 'defines': ['NO_TCMALLOC'],
346 }], 349 }],
347 ], 350 ],
348 }], 351 }],
349 ['OS=="win" or (OS=="linux" and target_arch!="arm")', { 352 ['OS=="win"', {
350 'defines': [ 353 'defines': [
351 'ENABLE_GPU=1', 354 'ENABLE_GPU=1',
352 ], 355 ],
353 }], 356 }],
354 ['coverage!=0', { 357 ['coverage!=0', {
355 'conditions': [ 358 'conditions': [
356 ['OS=="mac"', { 359 ['OS=="mac"', {
357 'xcode_settings': { 360 'xcode_settings': {
358 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', # -fprofile-arcs 361 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', # -fprofile-arcs
359 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', # -ftest-coverage 362 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', # -ftest-coverage
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 # and therefore SYMROOT, needs to be set at the project level. 1153 # and therefore SYMROOT, needs to be set at the project level.
1151 'SYMROOT': '<(DEPTH)/xcodebuild', 1154 'SYMROOT': '<(DEPTH)/xcodebuild',
1152 }, 1155 },
1153 } 1156 }
1154 1157
1155 # Local Variables: 1158 # Local Variables:
1156 # tab-width:2 1159 # tab-width:2
1157 # indent-tabs-mode:nil 1160 # indent-tabs-mode:nil
1158 # End: 1161 # End:
1159 # vim: set expandtab tabstop=2 shiftwidth=2: 1162 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698