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

Side by Side Diff: build/common.gypi

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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 1962 matching lines...) Expand 10 before | Expand all | Expand 10 after
1973 }, { 1973 }, {
1974 'enable_pepper_cdms%': 0, 1974 'enable_pepper_cdms%': 0,
1975 }], 1975 }],
1976 1976
1977 ['OS=="android"', { 1977 ['OS=="android"', {
1978 'enable_browser_cdms%': 1, 1978 'enable_browser_cdms%': 1,
1979 }, { 1979 }, {
1980 'enable_browser_cdms%': 0, 1980 'enable_browser_cdms%': 0,
1981 }], 1981 }],
1982 1982
1983 # Widevine CDM is enabled by default for Chrome builds, and is a platform
1984 # feature on Android.
1985 ['branding=="Chrome" or OS="android"', {
1986 'enable_widevine': 1,
1987 }, {
1988 'enable_widevine': 0,
lcwu1 2014/12/02 23:23:16 Drive-by comment: Could you add '%' to the gyp var
sandersd (OOO until July 31) 2014/12/12 01:34:46 Done.
1989 }],
1990
1991 # Widevine is distributed as a component for Mac and Win.
ddorwin 2014/12/02 23:31:56 This is only for Chrome. I guess we should make th
1992 ['OS=="mac" or OS=="win"', {
1993 'widevine_cdm_is_component': 1,
1994 }, {
1995 'widevine_cdm_is_component': 0,
1996 }],
1997
1983 # Native Client glibc toolchain is enabled 1998 # Native Client glibc toolchain is enabled
1984 # by default except on arm, mips and mips64. 1999 # by default except on arm, mips and mips64.
1985 ['target_arch=="arm" or target_arch=="mipsel" or target_arch=="mips64el"', { 2000 ['target_arch=="arm" or target_arch=="mipsel" or target_arch=="mips64el"', {
1986 'disable_glibc%': 1, 2001 'disable_glibc%': 1,
1987 }, { 2002 }, {
1988 'disable_glibc%': 0, 2003 'disable_glibc%': 0,
1989 }], 2004 }],
1990 2005
1991 # Set the relative path from this file to the GYP file of the JPEG 2006 # Set the relative path from this file to the GYP file of the JPEG
1992 # library used by Chromium. 2007 # library used by Chromium.
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
2649 }], 2664 }],
2650 ['enable_viewport==1', { 2665 ['enable_viewport==1', {
2651 'defines': ['ENABLE_VIEWPORT'], 2666 'defines': ['ENABLE_VIEWPORT'],
2652 }], 2667 }],
2653 ['enable_pepper_cdms==1', { 2668 ['enable_pepper_cdms==1', {
2654 'defines': ['ENABLE_PEPPER_CDMS'], 2669 'defines': ['ENABLE_PEPPER_CDMS'],
2655 }], 2670 }],
2656 ['enable_browser_cdms==1', { 2671 ['enable_browser_cdms==1', {
2657 'defines': ['ENABLE_BROWSER_CDMS'], 2672 'defines': ['ENABLE_BROWSER_CDMS'],
2658 }], 2673 }],
2674 ['enable_widevine==1', {
DaleCurtis 2014/12/02 22:58:38 These are global defines which should always be re
sandersd (OOO until July 31) 2014/12/02 23:04:44 I don't know. There is no common include that I am
DaleCurtis 2014/12/02 23:12:17 Ah, that's unfortunate. Do all of these users depe
lcwu1 2014/12/02 23:23:16 Chromecast uses the define. We do depend on media/
ddorwin 2014/12/02 23:31:56 Looking at the paths in this CL, there are some th
DaleCurtis 2014/12/03 01:11:00 Which targets don't depend on media? third_party/w
ddorwin 2014/12/03 01:29:45 As an example, from a brief look, it was not clear
DaleCurtis 2014/12/04 02:45:08 I see, I misread the paths, yeah I don't think a d
2675 'defines': ['ENABLE_WIDEVINE'],
2676 }],
2677 ['widevine_cdm_is_component==1', {
2678 'defines': ['WIDEVINE_CDM_IS_COMPONENT'],
2679 }],
2659 ['configuration_policy==1', { 2680 ['configuration_policy==1', {
2660 'defines': ['ENABLE_CONFIGURATION_POLICY'], 2681 'defines': ['ENABLE_CONFIGURATION_POLICY'],
2661 }], 2682 }],
2662 ['notifications==1', { 2683 ['notifications==1', {
2663 'defines': ['ENABLE_NOTIFICATIONS'], 2684 'defines': ['ENABLE_NOTIFICATIONS'],
2664 }], 2685 }],
2665 ['enable_hidpi==1', { 2686 ['enable_hidpi==1', {
2666 'defines': ['ENABLE_HIDPI=1'], 2687 'defines': ['ENABLE_HIDPI=1'],
2667 }], 2688 }],
2668 ['native_discardable_memory==1', { 2689 ['native_discardable_memory==1', {
(...skipping 3190 matching lines...) Expand 10 before | Expand all | Expand 10 after
5859 # settings in target dicts. SYMROOT is a special case, because many other 5880 # settings in target dicts. SYMROOT is a special case, because many other
5860 # Xcode variables depend on it, including variables such as 5881 # Xcode variables depend on it, including variables such as
5861 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5882 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5862 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5883 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5863 # files to appear (when present) in the UI as actual files and not red 5884 # files to appear (when present) in the UI as actual files and not red
5864 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5885 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5865 # and therefore SYMROOT, needs to be set at the project level. 5886 # and therefore SYMROOT, needs to be set at the project level.
5866 'SYMROOT': '<(DEPTH)/xcodebuild', 5887 'SYMROOT': '<(DEPTH)/xcodebuild',
5867 }, 5888 },
5868 } 5889 }
OLDNEW
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | chrome/browser/component_updater/widevine_cdm_component_installer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698