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

Side by Side Diff: build/common.gypi

Issue 10828396: Move the gyp variables used for grit defines on android to actually work. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: enable_printing is also used as a grit_defines Created 8 years, 4 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
« no previous file with comments | « no previous file | no next file » | 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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 'file_manager_extension%': 1, 449 'file_manager_extension%': 1,
450 }, { 450 }, {
451 'file_manager_extension%': 0, 451 'file_manager_extension%': 0,
452 }], 452 }],
453 453
454 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', { 454 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', {
455 'enable_one_click_signin%': 1, 455 'enable_one_click_signin%': 1,
456 }], 456 }],
457 457
458 ['OS=="android"', { 458 ['OS=="android"', {
459 'enable_extensions%': 0,
460 'enable_printing%': 0,
461 'enable_themes%': 0,
462 'enable_webrtc%': 0,
459 'proprietary_codecs%': 1, 463 'proprietary_codecs%': 1,
460 'enable_webrtc%': 0,
461 'remoting%': 0, 464 'remoting%': 0,
462 }], 465 }],
463 466
464 ['OS=="ios"', { 467 ['OS=="ios"', {
465 'enable_automation%': 0, 468 'enable_automation%': 0,
466 'remoting%': 0, 469 'remoting%': 0,
467 }], 470 }],
468 471
469 # Use GPU accelerated cross process image transport by default 472 # Use GPU accelerated cross process image transport by default
470 # on linux builds with the Aura window manager 473 # on linux builds with the Aura window manager
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 948
946 # Always uses openssl. 949 # Always uses openssl.
947 'use_openssl%': 1, 950 'use_openssl%': 1,
948 951
949 'proprietary_codecs%': '<(proprietary_codecs)', 952 'proprietary_codecs%': '<(proprietary_codecs)',
950 'enable_task_manager%': 0, 953 'enable_task_manager%': 0,
951 'safe_browsing%': 0, 954 'safe_browsing%': 0,
952 'configuration_policy%': 0, 955 'configuration_policy%': 0,
953 'input_speech%': 0, 956 'input_speech%': 0,
954 'enable_web_intents%': 0, 957 'enable_web_intents%': 0,
955 'enable_extensions%': 0,
956 'enable_automation%': 0, 958 'enable_automation%': 0,
957 'enable_printing%': 0,
958 'java_bridge%': 1, 959 'java_bridge%': 1,
959 'build_ffmpegsumo%': 0, 960 'build_ffmpegsumo%': 0,
960 'linux_use_tcmalloc%': 0, 961 'linux_use_tcmalloc%': 0,
961 962
962 # Disable Native Client. 963 # Disable Native Client.
963 'disable_nacl%': 1, 964 'disable_nacl%': 1,
964 965
965 # Android does not support themes.
966 'enable_themes%': 0,
967
968 # Android does not support background apps. 966 # Android does not support background apps.
969 'enable_background%': 0, 967 'enable_background%': 0,
970 968
971 # Sessions are store separately in the Java side. 969 # Sessions are store separately in the Java side.
972 'enable_session_service%': 0, 970 'enable_session_service%': 0,
973 971
974 # Set to 1 once we have a notification system for Android. 972 # Set to 1 once we have a notification system for Android.
975 # http://crbug.com/115320 973 # http://crbug.com/115320
976 'notifications%': 0, 974 'notifications%': 0,
977 975
(...skipping 2415 matching lines...) Expand 10 before | Expand all | Expand 10 after
3393 # settings in target dicts. SYMROOT is a special case, because many other 3391 # settings in target dicts. SYMROOT is a special case, because many other
3394 # Xcode variables depend on it, including variables such as 3392 # Xcode variables depend on it, including variables such as
3395 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3393 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3396 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3394 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3397 # files to appear (when present) in the UI as actual files and not red 3395 # files to appear (when present) in the UI as actual files and not red
3398 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3396 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3399 # and therefore SYMROOT, needs to be set at the project level. 3397 # and therefore SYMROOT, needs to be set at the project level.
3400 'SYMROOT': '<(DEPTH)/xcodebuild', 3398 'SYMROOT': '<(DEPTH)/xcodebuild',
3401 }, 3399 },
3402 } 3400 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698