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

Side by Side Diff: build/common.gypi

Issue 201563005: Revert r253110: "Enable webrtc for webview." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « android_webview/lib/main/aw_main_delegate.cc ('k') | 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 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 ['OS=="mac" or OS=="ios"', { 641 ['OS=="mac" or OS=="ios"', {
642 'native_discardable_memory%': 1, 642 'native_discardable_memory%': 1,
643 'native_memory_pressure_signals%': 1, 643 'native_memory_pressure_signals%': 1,
644 }], 644 }],
645 645
646 # Enable autofill dialog for Android, Mac and Views-enabled platforms. 646 # Enable autofill dialog for Android, Mac and Views-enabled platforms.
647 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', { 647 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', {
648 'enable_autofill_dialog%': 1 648 'enable_autofill_dialog%': 1
649 }], 649 }],
650 650
651 ['OS=="android"', { 651 ['OS=="android" and android_webview_build==0', {
652 'enable_webrtc%': 1, 652 'enable_webrtc%': 1,
653 }], 653 }],
654 654
655 # Disable WebRTC for building WebView as part of Android system.
656 # TODO(boliu): Decide if we want WebRTC, and if so, also merge
657 # the necessary third_party repositories.
658 ['OS=="android" and android_webview_build==1', {
659 'enable_webrtc%': 0,
660 }],
661
655 ['OS=="ios"', { 662 ['OS=="ios"', {
656 'disable_ftp_support%': 1, 663 'disable_ftp_support%': 1,
657 'enable_automation%': 0, 664 'enable_automation%': 0,
658 'enable_extensions%': 0, 665 'enable_extensions%': 0,
659 'enable_google_now%': 0, 666 'enable_google_now%': 0,
660 'cld_version%': 1, 667 'cld_version%': 1,
661 'enable_printing%': 0, 668 'enable_printing%': 0,
662 'enable_session_service%': 0, 669 'enable_session_service%': 0,
663 'enable_themes%': 0, 670 'enable_themes%': 0,
664 'enable_webrtc%': 0, 671 'enable_webrtc%': 0,
(...skipping 4377 matching lines...) Expand 10 before | Expand all | Expand 10 after
5042 # settings in target dicts. SYMROOT is a special case, because many other 5049 # settings in target dicts. SYMROOT is a special case, because many other
5043 # Xcode variables depend on it, including variables such as 5050 # Xcode variables depend on it, including variables such as
5044 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5051 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5045 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5052 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5046 # files to appear (when present) in the UI as actual files and not red 5053 # files to appear (when present) in the UI as actual files and not red
5047 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5054 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5048 # and therefore SYMROOT, needs to be set at the project level. 5055 # and therefore SYMROOT, needs to be set at the project level.
5049 'SYMROOT': '<(DEPTH)/xcodebuild', 5056 'SYMROOT': '<(DEPTH)/xcodebuild',
5050 }, 5057 },
5051 } 5058 }
OLDNEW
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698