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

Side by Side Diff: build/common.gypi

Issue 9836131: Remove PPB_Flash_NetConnector and ENABLE_FLAPPER_HACKS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/browser/renderer_host/pepper_message_filter.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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 'use_gnome_keyring%': 0, 346 'use_gnome_keyring%': 0,
347 }, { 347 }, {
348 'use_gnome_keyring%': 1, 348 'use_gnome_keyring%': 1,
349 }], 349 }],
350 350
351 ['toolkit_views==0 or OS=="mac"', { 351 ['toolkit_views==0 or OS=="mac"', {
352 # GTK+ and Mac wants Title Case strings 352 # GTK+ and Mac wants Title Case strings
353 'use_titlecase_in_grd_files%': 1, 353 'use_titlecase_in_grd_files%': 1,
354 }], 354 }],
355 355
356 # Enable some hacks to support Flapper only on Chrome OS.
357 ['chromeos==1', {
358 'enable_flapper_hacks%': 1,
359 }, {
360 'enable_flapper_hacks%': 0,
361 }],
362
363 # Enable file manager extension on Chrome OS. 356 # Enable file manager extension on Chrome OS.
364 ['chromeos==1', { 357 ['chromeos==1', {
365 'file_manager_extension%': 1, 358 'file_manager_extension%': 1,
366 }, { 359 }, {
367 'file_manager_extension%': 0, 360 'file_manager_extension%': 0,
368 }], 361 }],
369 362
370 # Enable WebUI TaskManager on Chrome OS or Aura. 363 # Enable WebUI TaskManager on Chrome OS or Aura.
371 ['chromeos==1 or use_aura==1', { 364 ['chromeos==1 or use_aura==1', {
372 'webui_task_manager%': 1, 365 'webui_task_manager%': 1,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 'use_openssl%': '<(use_openssl)', 443 'use_openssl%': '<(use_openssl)',
451 'use_nss%': '<(use_nss)', 444 'use_nss%': '<(use_nss)',
452 'os_bsd%': '<(os_bsd)', 445 'os_bsd%': '<(os_bsd)',
453 'os_posix%': '<(os_posix)', 446 'os_posix%': '<(os_posix)',
454 'use_glib%': '<(use_glib)', 447 'use_glib%': '<(use_glib)',
455 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 448 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
456 'use_skia%': '<(use_skia)', 449 'use_skia%': '<(use_skia)',
457 'use_x11%': '<(use_x11)', 450 'use_x11%': '<(use_x11)',
458 'use_gnome_keyring%': '<(use_gnome_keyring)', 451 'use_gnome_keyring%': '<(use_gnome_keyring)',
459 'linux_fpic%': '<(linux_fpic)', 452 'linux_fpic%': '<(linux_fpic)',
460 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
461 'enable_pepper_threading%': '<(enable_pepper_threading)', 453 'enable_pepper_threading%': '<(enable_pepper_threading)',
462 'chromeos%': '<(chromeos)', 454 'chromeos%': '<(chromeos)',
463 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 455 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
464 'enable_viewport%': '<(enable_viewport)', 456 'enable_viewport%': '<(enable_viewport)',
465 'use_xi2_mt%':'<(use_xi2_mt)', 457 'use_xi2_mt%':'<(use_xi2_mt)',
466 'file_manager_extension%': '<(file_manager_extension)', 458 'file_manager_extension%': '<(file_manager_extension)',
467 'webui_task_manager%': '<(webui_task_manager)', 459 'webui_task_manager%': '<(webui_task_manager)',
468 'inside_chromium_build%': '<(inside_chromium_build)', 460 'inside_chromium_build%': '<(inside_chromium_build)',
469 'fastbuild%': '<(fastbuild)', 461 'fastbuild%': '<(fastbuild)',
470 'dcheck_always_on%': '<(dcheck_always_on)', 462 'dcheck_always_on%': '<(dcheck_always_on)',
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 }], 1199 }],
1208 ['enable_webrtc==1', { 1200 ['enable_webrtc==1', {
1209 'defines': ['ENABLE_WEBRTC=1'], 1201 'defines': ['ENABLE_WEBRTC=1'],
1210 }], 1202 }],
1211 ['p2p_apis==1', { 1203 ['p2p_apis==1', {
1212 'defines': ['ENABLE_P2P_APIS=1'], 1204 'defines': ['ENABLE_P2P_APIS=1'],
1213 }], 1205 }],
1214 ['proprietary_codecs==1', { 1206 ['proprietary_codecs==1', {
1215 'defines': ['USE_PROPRIETARY_CODECS'], 1207 'defines': ['USE_PROPRIETARY_CODECS'],
1216 }], 1208 }],
1217 ['enable_flapper_hacks==1', {
1218 'defines': ['ENABLE_FLAPPER_HACKS=1'],
1219 }],
1220 ['enable_pepper_threading==1', { 1209 ['enable_pepper_threading==1', {
1221 'defines': ['ENABLE_PEPPER_THREADING'], 1210 'defines': ['ENABLE_PEPPER_THREADING'],
1222 }], 1211 }],
1223 ['enable_viewport==1', { 1212 ['enable_viewport==1', {
1224 'defines': ['ENABLE_VIEWPORT'], 1213 'defines': ['ENABLE_VIEWPORT'],
1225 }], 1214 }],
1226 ['configuration_policy==1', { 1215 ['configuration_policy==1', {
1227 'defines': ['ENABLE_CONFIGURATION_POLICY'], 1216 'defines': ['ENABLE_CONFIGURATION_POLICY'],
1228 }], 1217 }],
1229 ['input_speech==1', { 1218 ['input_speech==1', {
(...skipping 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after
2943 # settings in target dicts. SYMROOT is a special case, because many other 2932 # settings in target dicts. SYMROOT is a special case, because many other
2944 # Xcode variables depend on it, including variables such as 2933 # Xcode variables depend on it, including variables such as
2945 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2934 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2946 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2935 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2947 # files to appear (when present) in the UI as actual files and not red 2936 # files to appear (when present) in the UI as actual files and not red
2948 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2937 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2949 # and therefore SYMROOT, needs to be set at the project level. 2938 # and therefore SYMROOT, needs to be set at the project level.
2950 'SYMROOT': '<(DEPTH)/xcodebuild', 2939 'SYMROOT': '<(DEPTH)/xcodebuild',
2951 }, 2940 },
2952 } 2941 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/pepper_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698