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

Side by Side Diff: build/common.gypi

Issue 219463004: Revert "Revert r253110: "Enable webrtc for webview."" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 | « 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 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 ['OS=="mac" or OS=="ios"', { 686 ['OS=="mac" or OS=="ios"', {
687 'native_discardable_memory%': 1, 687 'native_discardable_memory%': 1,
688 'native_memory_pressure_signals%': 1, 688 'native_memory_pressure_signals%': 1,
689 }], 689 }],
690 690
691 # Enable autofill dialog for Android, Mac and Views-enabled platforms. 691 # Enable autofill dialog for Android, Mac and Views-enabled platforms.
692 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', { 692 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', {
693 'enable_autofill_dialog%': 1 693 'enable_autofill_dialog%': 1
694 }], 694 }],
695 695
696 ['OS=="android" and android_webview_build==0', { 696 ['OS=="android"', {
697 'enable_webrtc%': 1, 697 'enable_webrtc%': 1,
698 }], 698 }],
699 699
700 # Disable WebRTC for building WebView as part of Android system.
701 # TODO(boliu): Decide if we want WebRTC, and if so, also merge
702 # the necessary third_party repositories.
703 ['OS=="android" and android_webview_build==1', {
704 'enable_webrtc%': 0,
705 }],
706
707 ['OS=="ios"', { 700 ['OS=="ios"', {
708 'disable_ftp_support%': 1, 701 'disable_ftp_support%': 1,
709 'enable_automation%': 0, 702 'enable_automation%': 0,
710 'enable_extensions%': 0, 703 'enable_extensions%': 0,
711 'enable_google_now%': 0, 704 'enable_google_now%': 0,
712 'cld_version%': 1, 705 'cld_version%': 1,
713 'cld2_dynamic%': 0, 706 'cld2_dynamic%': 0,
714 'enable_printing%': 0, 707 'enable_printing%': 0,
715 'enable_session_service%': 0, 708 'enable_session_service%': 0,
716 'enable_themes%': 0, 709 'enable_themes%': 0,
(...skipping 4487 matching lines...) Expand 10 before | Expand all | Expand 10 after
5204 # settings in target dicts. SYMROOT is a special case, because many other 5197 # settings in target dicts. SYMROOT is a special case, because many other
5205 # Xcode variables depend on it, including variables such as 5198 # Xcode variables depend on it, including variables such as
5206 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5199 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5207 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5200 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5208 # files to appear (when present) in the UI as actual files and not red 5201 # files to appear (when present) in the UI as actual files and not red
5209 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5202 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5210 # and therefore SYMROOT, needs to be set at the project level. 5203 # and therefore SYMROOT, needs to be set at the project level.
5211 'SYMROOT': '<(DEPTH)/xcodebuild', 5204 'SYMROOT': '<(DEPTH)/xcodebuild',
5212 }, 5205 },
5213 } 5206 }
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