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

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: 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
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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_printing%': 0, 526 'enable_printing%': 0,
527 'enable_spellcheck%': 0, 527 'enable_spellcheck%': 0,
528 'enable_themes%': 0, 528 'enable_themes%': 0,
529 'proprietary_codecs%': 1,
530 'remoting%': 0, 529 'remoting%': 0,
531 'arm_neon%': 0, 530 'arm_neon%': 0,
532 'arm_neon_optional%': 1, 531 'arm_neon_optional%': 1,
533 'native_discardable_memory%': 1, 532 'native_discardable_memory%': 1,
534 'native_memory_pressure_signals%': 1, 533 'native_memory_pressure_signals%': 1,
535 }], 534 }],
536 535
536 # Android OS includes support for proprietary codecs regardless of
537 # building Chromium or Google Chrome. We also ship Google Chrome with
538 # proprietary codecs.
539 ['OS=="android" or branding=="Chrome"', {
540 'proprietary_codecs%': 1,
541 }],
542
537 # Enable autofill dialog for Android, Mac and Views-enabled platforms. 543 # Enable autofill dialog for Android, Mac and Views-enabled platforms.
538 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', { 544 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', {
539 'enable_autofill_dialog%': 1 545 'enable_autofill_dialog%': 1
540 }], 546 }],
541 547
542 ['OS=="android" and android_webview_build==0', { 548 ['OS=="android" and android_webview_build==0', {
543 'enable_webrtc%': 1, 549 'enable_webrtc%': 1,
544 }], 550 }],
545 551
546 # Disable WebRTC for building WebView as part of Android system. 552 # Disable WebRTC for building WebView as part of Android system.
(...skipping 4159 matching lines...) Expand 10 before | Expand all | Expand 10 after
4706 # settings in target dicts. SYMROOT is a special case, because many other 4712 # settings in target dicts. SYMROOT is a special case, because many other
4707 # Xcode variables depend on it, including variables such as 4713 # Xcode variables depend on it, including variables such as
4708 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4714 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4709 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4715 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4710 # files to appear (when present) in the UI as actual files and not red 4716 # files to appear (when present) in the UI as actual files and not red
4711 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4717 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4712 # and therefore SYMROOT, needs to be set at the project level. 4718 # and therefore SYMROOT, needs to be set at the project level.
4713 'SYMROOT': '<(DEPTH)/xcodebuild', 4719 'SYMROOT': '<(DEPTH)/xcodebuild',
4714 }, 4720 },
4715 } 4721 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/icon_loader_chromeos.cc » ('j') | content/browser/media/encrypted_media_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698