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

Side by Side Diff: build/common.gypi

Issue 23205006: Define proprietary_codecs=1 when branding==Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase onto lkgr Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/icon_loader_chromeos.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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { 518 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
519 'enable_one_click_signin%': 1, 519 'enable_one_click_signin%': 1,
520 }], 520 }],
521 521
522 ['OS=="android"', { 522 ['OS=="android"', {
523 'enable_automation%': 0, 523 'enable_automation%': 0,
524 'enable_extensions%': 0, 524 'enable_extensions%': 0,
525 'enable_google_now%': 0, 525 'enable_google_now%': 0,
526 'enable_spellcheck%': 0, 526 'enable_spellcheck%': 0,
527 'enable_themes%': 0, 527 'enable_themes%': 0,
528 'proprietary_codecs%': 1,
529 'remoting%': 0, 528 'remoting%': 0,
530 'arm_neon%': 0, 529 'arm_neon%': 0,
531 'arm_neon_optional%': 1, 530 'arm_neon_optional%': 1,
532 'native_discardable_memory%': 1, 531 'native_discardable_memory%': 1,
533 'native_memory_pressure_signals%': 1, 532 'native_memory_pressure_signals%': 1,
534 }], 533 }],
535 534
536 » # Enable basic printing for Chrome for Android but disable printing 535 # Enable basic printing for Chrome for Android but disable printing
537 » # completely for WebView. 536 # completely for WebView.
538 ['OS=="android" and android_webview_build==0', { 537 ['OS=="android" and android_webview_build==0', {
539 'enable_printing%': 2, 538 'enable_printing%': 2,
540 }], 539 }],
541 ['OS=="android" and android_webview_build==1', { 540 ['OS=="android" and android_webview_build==1', {
542 'enable_printing%': 0, 541 'enable_printing%': 0,
543 }], 542 }],
544 543
544 # Android OS includes support for proprietary codecs regardless of
545 # building Chromium or Google Chrome. We also ship Google Chrome with
546 # proprietary codecs.
547 ['OS=="android" or branding=="Chrome"', {
548 'proprietary_codecs%': 1,
549 }],
550
545 # Enable autofill dialog for Android, Mac and Views-enabled platforms. 551 # Enable autofill dialog for Android, Mac and Views-enabled platforms.
546 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', { 552 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', {
547 'enable_autofill_dialog%': 1 553 'enable_autofill_dialog%': 1
548 }], 554 }],
549 555
550 ['OS=="android" and android_webview_build==0', { 556 ['OS=="android" and android_webview_build==0', {
551 'enable_webrtc%': 1, 557 'enable_webrtc%': 1,
552 }], 558 }],
553 559
554 # Disable WebRTC for building WebView as part of Android system. 560 # Disable WebRTC for building WebView as part of Android system.
(...skipping 4157 matching lines...) Expand 10 before | Expand all | Expand 10 after
4712 # settings in target dicts. SYMROOT is a special case, because many other 4718 # settings in target dicts. SYMROOT is a special case, because many other
4713 # Xcode variables depend on it, including variables such as 4719 # Xcode variables depend on it, including variables such as
4714 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4720 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4715 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4721 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4716 # files to appear (when present) in the UI as actual files and not red 4722 # files to appear (when present) in the UI as actual files and not red
4717 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4723 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4718 # and therefore SYMROOT, needs to be set at the project level. 4724 # and therefore SYMROOT, needs to be set at the project level.
4719 'SYMROOT': '<(DEPTH)/xcodebuild', 4725 'SYMROOT': '<(DEPTH)/xcodebuild',
4720 }, 4726 },
4721 } 4727 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698