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

Side by Side Diff: build/common.gypi

Issue 15526004: Revert "Disable intreactive autocomplete and remove command line flag for Android" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 'enable_language_detection%': 1, 494 'enable_language_detection%': 1,
495 'enable_printing%': 0, 495 'enable_printing%': 0,
496 'enable_themes%': 0, 496 'enable_themes%': 0,
497 'proprietary_codecs%': 1, 497 'proprietary_codecs%': 1,
498 'remoting%': 0, 498 'remoting%': 0,
499 'arm_neon%': 0, 499 'arm_neon%': 0,
500 'arm_neon_optional%': 1, 500 'arm_neon_optional%': 1,
501 }], 501 }],
502 502
503 # Enable autofill dialog for Android and Views-enabled platforms for now . 503 # Enable autofill dialog for Android and Views-enabled platforms for now .
504 ['toolkit_views==1', { 504 ['toolkit_views==1 or (OS=="android" and android_webview_build==0)', {
505 'enable_autofill_dialog%': 1 505 'enable_autofill_dialog%': 1
506 }], 506 }],
507 507
508 ['OS=="android" and android_webview_build==0', { 508 ['OS=="android" and android_webview_build==0', {
509 'enable_webrtc%': 1, 509 'enable_webrtc%': 1,
510 }], 510 }],
511 511
512 # Disable WebRTC for building WebView as part of Android system. 512 # Disable WebRTC for building WebView as part of Android system.
513 # TODO(boliu): Decide if we want WebRTC, and if so, also merge 513 # TODO(boliu): Decide if we want WebRTC, and if so, also merge
514 # the necessary third_party repositories. 514 # the necessary third_party repositories.
(...skipping 3927 matching lines...) Expand 10 before | Expand all | Expand 10 after
4442 # settings in target dicts. SYMROOT is a special case, because many other 4442 # settings in target dicts. SYMROOT is a special case, because many other
4443 # Xcode variables depend on it, including variables such as 4443 # Xcode variables depend on it, including variables such as
4444 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4444 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4445 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4445 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4446 # files to appear (when present) in the UI as actual files and not red 4446 # files to appear (when present) in the UI as actual files and not red
4447 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4447 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4448 # and therefore SYMROOT, needs to be set at the project level. 4448 # and therefore SYMROOT, needs to be set at the project level.
4449 'SYMROOT': '<(DEPTH)/xcodebuild', 4449 'SYMROOT': '<(DEPTH)/xcodebuild',
4450 }, 4450 },
4451 } 4451 }
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