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

Side by Side Diff: build/common.gypi

Issue 481001: Re-enable the build of Pepper support by default (issue 464074, svn revision ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | « build/all.gyp ('k') | chrome/browser/renderer_host/browser_render_process_host.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) 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 # {'variables': {'library': 'shared_library'}} 155 # {'variables': {'library': 'shared_library'}}
156 # to compile as shared by default 156 # to compile as shared by default
157 'library%': 'static_library', 157 'library%': 'static_library',
158 158
159 # The Google Update appid. 159 # The Google Update appid.
160 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}', 160 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
161 161
162 # Whether to add the experimental build define. 162 # Whether to add the experimental build define.
163 'chrome_frame_define%': 0, 163 'chrome_frame_define%': 0,
164 164
165 # Whether pepper APIs are enabled. 165 # Whether GPU plugin build is enabled.
166 'enable_pepper%': 0, 166 'enable_gpu%': 0,
167 167
168 # Whether usage of OpenMAX is enabled. 168 # Whether usage of OpenMAX is enabled.
169 'enable_openmax%': 0, 169 'enable_openmax%': 0,
170 170
171 # TODO(bradnelson): eliminate this when possible. 171 # TODO(bradnelson): eliminate this when possible.
172 # To allow local gyp files to prevent release.vsprops from being included. 172 # To allow local gyp files to prevent release.vsprops from being included.
173 # Yes(1) means include release.vsprops. 173 # Yes(1) means include release.vsprops.
174 # Once all vsprops settings are migrated into gyp, this can go away. 174 # Once all vsprops settings are migrated into gyp, this can go away.
175 'msvs_use_common_release%': 1, 175 'msvs_use_common_release%': 1,
176 176
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 }], 334 }],
335 ['toolkit_views==1', { 335 ['toolkit_views==1', {
336 'defines': ['TOOLKIT_VIEWS=1'], 336 'defines': ['TOOLKIT_VIEWS=1'],
337 }], 337 }],
338 ['chromeos==1', { 338 ['chromeos==1', {
339 'defines': ['CHROMEOS_TRANSITIONAL=1'], 339 'defines': ['CHROMEOS_TRANSITIONAL=1'],
340 }], 340 }],
341 ['chromeos==1 or toolkit_views==1', { 341 ['chromeos==1 or toolkit_views==1', {
342 'defines': ['OS_CHROMEOS=1'], 342 'defines': ['OS_CHROMEOS=1'],
343 }], 343 }],
344 ['enable_pepper==1', { 344 ['enable_gpu==1', {
345 'defines': ['ENABLE_PEPPER=1'], 345 'defines': ['ENABLE_GPU=1'],
346 }], 346 }],
347 ['fastbuild!=0', { 347 ['fastbuild!=0', {
348 'conditions': [ 348 'conditions': [
349 # Finally, for Windows, we simply turn on profiling. 349 # Finally, for Windows, we simply turn on profiling.
350 ['OS=="win"', { 350 ['OS=="win"', {
351 'msvs_settings': { 351 'msvs_settings': {
352 'VCLinkerTool': { 352 'VCLinkerTool': {
353 'GenerateDebugInformation': 'false', 353 'GenerateDebugInformation': 'false',
354 }, 354 },
355 'VCCLCompilerTool': { 355 'VCCLCompilerTool': {
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 # and therefore SYMROOT, needs to be set at the project level. 1102 # and therefore SYMROOT, needs to be set at the project level.
1103 'SYMROOT': '<(DEPTH)/xcodebuild', 1103 'SYMROOT': '<(DEPTH)/xcodebuild',
1104 }, 1104 },
1105 } 1105 }
1106 1106
1107 # Local Variables: 1107 # Local Variables:
1108 # tab-width:2 1108 # tab-width:2
1109 # indent-tabs-mode:nil 1109 # indent-tabs-mode:nil
1110 # End: 1110 # End:
1111 # vim: set expandtab tabstop=2 shiftwidth=2: 1111 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698