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

Side by Side Diff: build/common.gypi

Issue 12330059: Enable autofill dialog codepath on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: #if defined(X) instead of #if X; removed unused grit section. Created 7 years, 10 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/browser/about_flags.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) 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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 'enable_pepper_threading%': 1, 326 'enable_pepper_threading%': 1,
327 327
328 # Enables use of the session service, which is enabled by default. 328 # Enables use of the session service, which is enabled by default.
329 # Support for disabling depends on the platform. 329 # Support for disabling depends on the platform.
330 'enable_session_service%': 1, 330 'enable_session_service%': 1,
331 331
332 # Enables theme support, which is enabled by default. Support for 332 # Enables theme support, which is enabled by default. Support for
333 # disabling depends on the platform. 333 # disabling depends on the platform.
334 'enable_themes%': 1, 334 'enable_themes%': 1,
335 335
336 # Enables autofill dialog and associated features; disabled by default.
337 'enable_autofill_dialog%' : 0,
338
336 # Uses OEM-specific wallpaper resources on Chrome OS. 339 # Uses OEM-specific wallpaper resources on Chrome OS.
337 'use_oem_wallpaper%': 0, 340 'use_oem_wallpaper%': 0,
338 341
339 # Enables support for background apps. 342 # Enables support for background apps.
340 'enable_background%': 1, 343 'enable_background%': 1,
341 344
342 # Enable the task manager by default. 345 # Enable the task manager by default.
343 'enable_task_manager%': 1, 346 'enable_task_manager%': 1,
344 347
345 # Enable FTP support by default. 348 # Enable FTP support by default.
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 'enable_automation%': 0, 484 'enable_automation%': 0,
482 'enable_extensions%': 0, 485 'enable_extensions%': 0,
483 'enable_google_now%': 0, 486 'enable_google_now%': 0,
484 'enable_language_detection%': 1, 487 'enable_language_detection%': 1,
485 'enable_printing%': 0, 488 'enable_printing%': 0,
486 'enable_themes%': 0, 489 'enable_themes%': 0,
487 'proprietary_codecs%': 1, 490 'proprietary_codecs%': 1,
488 'remoting%': 0, 491 'remoting%': 0,
489 }], 492 }],
490 493
494 # Enable autofill dialog for Android and Views-enabled platforms for now .
495 ['toolkit_views==1 or (OS=="android" and android_build_type==0)', {
496 'enable_autofill_dialog%': 1
497 }],
498
491 ['OS=="android" and android_build_type==0', { 499 ['OS=="android" and android_build_type==0', {
492 'enable_webrtc%': 1, 500 'enable_webrtc%': 1,
493 }], 501 }],
494 502
495 # Disable WebRTC for building WebView as part of Android system. 503 # Disable WebRTC for building WebView as part of Android system.
496 # TODO(boliu): Decide if we want WebRTC, and if so, also merge 504 # TODO(boliu): Decide if we want WebRTC, and if so, also merge
497 # the necessary third_party repositories. 505 # the necessary third_party repositories.
498 ['OS=="android" and android_build_type==1', { 506 ['OS=="android" and android_build_type==1', {
499 'enable_webrtc%': 0, 507 'enable_webrtc%': 0,
500 }], 508 }],
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 'tsan_blacklist%': '<(tsan_blacklist)', 710 'tsan_blacklist%': '<(tsan_blacklist)',
703 'clang_type_profiler%': '<(clang_type_profiler)', 711 'clang_type_profiler%': '<(clang_type_profiler)',
704 'order_profiling%': '<(order_profiling)', 712 'order_profiling%': '<(order_profiling)',
705 'order_text_section%': '<(order_text_section)', 713 'order_text_section%': '<(order_text_section)',
706 'enable_extensions%': '<(enable_extensions)', 714 'enable_extensions%': '<(enable_extensions)',
707 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 715 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
708 'enable_plugin_installation%': '<(enable_plugin_installation)', 716 'enable_plugin_installation%': '<(enable_plugin_installation)',
709 'enable_plugins%': '<(enable_plugins)', 717 'enable_plugins%': '<(enable_plugins)',
710 'enable_session_service%': '<(enable_session_service)', 718 'enable_session_service%': '<(enable_session_service)',
711 'enable_themes%': '<(enable_themes)', 719 'enable_themes%': '<(enable_themes)',
720 'enable_autofill_dialog%': '<(enable_autofill_dialog)',
712 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 721 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
713 'enable_background%': '<(enable_background)', 722 'enable_background%': '<(enable_background)',
714 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 723 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
715 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 724 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
716 'linux_use_libgps%': '<(linux_use_libgps)', 725 'linux_use_libgps%': '<(linux_use_libgps)',
717 'use_canvas_skia%': '<(use_canvas_skia)', 726 'use_canvas_skia%': '<(use_canvas_skia)',
718 'test_isolation_mode%': '<(test_isolation_mode)', 727 'test_isolation_mode%': '<(test_isolation_mode)',
719 'test_isolation_outdir%': '<(test_isolation_outdir)', 728 'test_isolation_outdir%': '<(test_isolation_outdir)',
720 'enable_automation%': '<(enable_automation)', 729 'enable_automation%': '<(enable_automation)',
721 'enable_printing%': '<(enable_printing)', 730 'enable_printing%': '<(enable_printing)',
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1961 }], 1970 }],
1962 ['enable_plugins==1', { 1971 ['enable_plugins==1', {
1963 'defines': ['ENABLE_PLUGINS=1'], 1972 'defines': ['ENABLE_PLUGINS=1'],
1964 }], 1973 }],
1965 ['enable_session_service==1', { 1974 ['enable_session_service==1', {
1966 'defines': ['ENABLE_SESSION_SERVICE=1'], 1975 'defines': ['ENABLE_SESSION_SERVICE=1'],
1967 }], 1976 }],
1968 ['enable_themes==1', { 1977 ['enable_themes==1', {
1969 'defines': ['ENABLE_THEMES=1'], 1978 'defines': ['ENABLE_THEMES=1'],
1970 }], 1979 }],
1980 ['enable_autofill_dialog==1', {
1981 'defines': ['ENABLE_AUTOFILL_DIALOG=1'],
1982 }],
1971 ['enable_background==1', { 1983 ['enable_background==1', {
1972 'defines': ['ENABLE_BACKGROUND=1'], 1984 'defines': ['ENABLE_BACKGROUND=1'],
1973 }], 1985 }],
1974 ['enable_automation==1', { 1986 ['enable_automation==1', {
1975 'defines': ['ENABLE_AUTOMATION=1'], 1987 'defines': ['ENABLE_AUTOMATION=1'],
1976 }], 1988 }],
1977 ['enable_google_now==1', { 1989 ['enable_google_now==1', {
1978 'defines': ['ENABLE_GOOGLE_NOW=1'], 1990 'defines': ['ENABLE_GOOGLE_NOW=1'],
1979 }], 1991 }],
1980 ['enable_language_detection==1', { 1992 ['enable_language_detection==1', {
(...skipping 2065 matching lines...) Expand 10 before | Expand all | Expand 10 after
4046 # settings in target dicts. SYMROOT is a special case, because many other 4058 # settings in target dicts. SYMROOT is a special case, because many other
4047 # Xcode variables depend on it, including variables such as 4059 # Xcode variables depend on it, including variables such as
4048 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4060 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4049 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4061 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4050 # files to appear (when present) in the UI as actual files and not red 4062 # files to appear (when present) in the UI as actual files and not red
4051 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4063 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4052 # and therefore SYMROOT, needs to be set at the project level. 4064 # and therefore SYMROOT, needs to be set at the project level.
4053 'SYMROOT': '<(DEPTH)/xcodebuild', 4065 'SYMROOT': '<(DEPTH)/xcodebuild',
4054 }, 4066 },
4055 } 4067 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698