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

Side by Side Diff: build/common.gypi

Issue 11826059: Add ManagedUserService for profile-specific managed user data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win fix Created 7 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
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 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 # TODO(maruel): Converted the default from 'check' to 'noop' so work can 403 # TODO(maruel): Converted the default from 'check' to 'noop' so work can
404 # be done while the builders are being reconfigured to check out test data 404 # be done while the builders are being reconfigured to check out test data
405 # files. 405 # files.
406 'test_isolation_mode%': 'noop', 406 'test_isolation_mode%': 'noop',
407 # If no directory is specified then a temporary directory will be used. 407 # If no directory is specified then a temporary directory will be used.
408 'test_isolation_outdir%': '', 408 'test_isolation_outdir%': '',
409 409
410 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86', 410 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
411 'wix_path%': '<(DEPTH)/third_party/wix', 411 'wix_path%': '<(DEPTH)/third_party/wix',
412 412
413 # Managed users are enabled by default.
414 'enable_managed_users%': 1,
415
413 'conditions': [ 416 'conditions': [
414 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of 417 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
415 # the 'conditions' clause. Initial attempts resulted in chromium and 418 # the 'conditions' clause. Initial attempts resulted in chromium and
416 # webkit disagreeing on its setting. 419 # webkit disagreeing on its setting.
417 ['OS=="mac"', { 420 ['OS=="mac"', {
418 'use_skia%': 1, 421 'use_skia%': 1,
419 }, { 422 }, {
420 'use_skia%': 1, 423 'use_skia%': 1,
421 }], 424 }],
422 425
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 'enable_extensions%': 0, 514 'enable_extensions%': 0,
512 'enable_google_now%': 0, 515 'enable_google_now%': 0,
513 'enable_language_detection%': 0, 516 'enable_language_detection%': 0,
514 'enable_printing%': 0, 517 'enable_printing%': 0,
515 'enable_session_service%': 0, 518 'enable_session_service%': 0,
516 'enable_themes%': 0, 519 'enable_themes%': 0,
517 'enable_webrtc%': 0, 520 'enable_webrtc%': 0,
518 'notifications%': 0, 521 'notifications%': 0,
519 'remoting%': 0, 522 'remoting%': 0,
520 'safe_browsing%': 0, 523 'safe_browsing%': 0,
524 'enable_managed_users%': 0,
521 }], 525 }],
522 526
523 # Use GPU accelerated cross process image transport by default 527 # Use GPU accelerated cross process image transport by default
524 # on linux builds with the Aura window manager 528 # on linux builds with the Aura window manager
525 ['use_aura==1 and OS=="linux"', { 529 ['use_aura==1 and OS=="linux"', {
526 'ui_compositor_image_transport%': 1, 530 'ui_compositor_image_transport%': 1,
527 }, { 531 }, {
528 'ui_compositor_image_transport%': 0, 532 'ui_compositor_image_transport%': 0,
529 }], 533 }],
530 534
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 'use_system_libjpeg%': '<(use_system_libjpeg)', 737 'use_system_libjpeg%': '<(use_system_libjpeg)',
734 'android_build_type%': '<(android_build_type)', 738 'android_build_type%': '<(android_build_type)',
735 'enable_app_list%': '<(enable_app_list)', 739 'enable_app_list%': '<(enable_app_list)',
736 'enable_message_center%': '<(enable_message_center)', 740 'enable_message_center%': '<(enable_message_center)',
737 'use_default_render_theme%': '<(use_default_render_theme)', 741 'use_default_render_theme%': '<(use_default_render_theme)',
738 'enable_settings_app%': '<(enable_settings_app)', 742 'enable_settings_app%': '<(enable_settings_app)',
739 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 743 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
740 'google_api_key%': '<(google_api_key)', 744 'google_api_key%': '<(google_api_key)',
741 'google_default_client_id%': '<(google_default_client_id)', 745 'google_default_client_id%': '<(google_default_client_id)',
742 'google_default_client_secret%': '<(google_default_client_secret)', 746 'google_default_client_secret%': '<(google_default_client_secret)',
747 'enable_managed_users%': '<(enable_managed_users)',
743 748
744 # Use system mesa instead of bundled one. 749 # Use system mesa instead of bundled one.
745 'use_system_mesa%': 0, 750 'use_system_mesa%': 0,
746 751
747 # Use system nspr instead of the bundled one. 752 # Use system nspr instead of the bundled one.
748 'use_system_nspr%': 0, 753 'use_system_nspr%': 0,
749 754
750 # Use system protobuf instead of bundled one. 755 # Use system protobuf instead of bundled one.
751 'use_system_protobuf%': 0, 756 'use_system_protobuf%': 0,
752 757
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1187 ], 1192 ],
1188 1193
1189 # When building as part of the Android system, use system libraries 1194 # When building as part of the Android system, use system libraries
1190 # where possible to reduce ROM size. 1195 # where possible to reduce ROM size.
1191 # TODO(steveblock): Investigate using the system version of sqlite. 1196 # TODO(steveblock): Investigate using the system version of sqlite.
1192 'use_system_sqlite%': 0, # '<(android_build_type)', 1197 'use_system_sqlite%': 0, # '<(android_build_type)',
1193 'use_system_expat%': '<(android_build_type)', 1198 'use_system_expat%': '<(android_build_type)',
1194 'use_system_icu%': '<(android_build_type)', 1199 'use_system_icu%': '<(android_build_type)',
1195 'use_system_stlport%': '<(android_build_type)', 1200 'use_system_stlport%': '<(android_build_type)',
1196 1201
1202 'enable_managed_users%': 0,
1203
1197 # Copy it out one scope. 1204 # Copy it out one scope.
1198 'android_build_type%': '<(android_build_type)', 1205 'android_build_type%': '<(android_build_type)',
1199 }], # OS=="android" 1206 }], # OS=="android"
1200 ['OS=="mac"', { 1207 ['OS=="mac"', {
1201 'variables': { 1208 'variables': {
1202 # Mac OS X SDK and deployment target support. The SDK identifies 1209 # Mac OS X SDK and deployment target support. The SDK identifies
1203 # the version of the system headers that will be used, and 1210 # the version of the system headers that will be used, and
1204 # corresponds to the MAC_OS_X_VERSION_MAX_ALLOWED compile-time 1211 # corresponds to the MAC_OS_X_VERSION_MAX_ALLOWED compile-time
1205 # macro. "Maximum allowed" refers to the operating system version 1212 # macro. "Maximum allowed" refers to the operating system version
1206 # whose APIs are available in the headers. The deployment target 1213 # whose APIs are available in the headers. The deployment target
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 }], 1962 }],
1956 ['enable_message_center==1', { 1963 ['enable_message_center==1', {
1957 'defines': ['ENABLE_MESSAGE_CENTER=1'], 1964 'defines': ['ENABLE_MESSAGE_CENTER=1'],
1958 }], 1965 }],
1959 ['enable_settings_app==1', { 1966 ['enable_settings_app==1', {
1960 'defines': ['ENABLE_SETTINGS_APP=1'], 1967 'defines': ['ENABLE_SETTINGS_APP=1'],
1961 }], 1968 }],
1962 ['disable_ftp_support==1', { 1969 ['disable_ftp_support==1', {
1963 'defines': ['DISABLE_FTP_SUPPORT=1'], 1970 'defines': ['DISABLE_FTP_SUPPORT=1'],
1964 }], 1971 }],
1972 ['enable_managed_users==1', {
1973 'defines': ['ENABLE_MANAGED_USERS=1'],
1974 }],
1965 ], # conditions for 'target_defaults' 1975 ], # conditions for 'target_defaults'
1966 'target_conditions': [ 1976 'target_conditions': [
1967 ['enable_wexit_time_destructors==1', { 1977 ['enable_wexit_time_destructors==1', {
1968 'conditions': [ 1978 'conditions': [
1969 [ 'clang==1', { 1979 [ 'clang==1', {
1970 'cflags': [ 1980 'cflags': [
1971 '-Wexit-time-destructors', 1981 '-Wexit-time-destructors',
1972 ], 1982 ],
1973 'xcode_settings': { 1983 'xcode_settings': {
1974 'WARNING_CFLAGS': [ 1984 'WARNING_CFLAGS': [
(...skipping 2009 matching lines...) Expand 10 before | Expand all | Expand 10 after
3984 # settings in target dicts. SYMROOT is a special case, because many other 3994 # settings in target dicts. SYMROOT is a special case, because many other
3985 # Xcode variables depend on it, including variables such as 3995 # Xcode variables depend on it, including variables such as
3986 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3996 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3987 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3997 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3988 # files to appear (when present) in the UI as actual files and not red 3998 # files to appear (when present) in the UI as actual files and not red
3989 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3999 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3990 # and therefore SYMROOT, needs to be set at the project level. 4000 # and therefore SYMROOT, needs to be set at the project level.
3991 'SYMROOT': '<(DEPTH)/xcodebuild', 4001 'SYMROOT': '<(DEPTH)/xcodebuild',
3992 }, 4002 },
3993 } 4003 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698