diff options
| -rw-r--r-- | build/common.gypi | 10 | ||||
| -rw-r--r-- | chrome/browser/android/chrome_startup_flags.cc | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 80acde7..53772a1 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -107,6 +107,9 @@ # Android build system, value 1). 'android_build_type%': 0, + # Sets whether chrome is built for google tv device. + 'google_tv%': 0, + 'conditions': [ # Set default value of toolkit_views based on OS. ['OS=="win" or chromeos==1 or use_aura==1', { @@ -167,6 +170,7 @@ 'enable_hidpi%': '<(enable_hidpi)', 'enable_touch_ui%': '<(enable_touch_ui)', 'android_build_type%': '<(android_build_type)', + 'google_tv%': '<(google_tv)', 'enable_app_list%': '<(enable_app_list)', 'enable_message_center%': '<(enable_message_center)', 'use_default_render_theme%': '<(use_default_render_theme)', @@ -540,7 +544,7 @@ 'enable_plugin_installation%': 1, }], - ['OS=="android" or OS=="ios"', { + ['(OS=="android" and google_tv!=1) or OS=="ios"', { 'enable_plugins%': 0, }, { 'enable_plugins%': 1, @@ -732,6 +736,7 @@ 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 'use_system_libjpeg%': '<(use_system_libjpeg)', 'android_build_type%': '<(android_build_type)', + 'google_tv%': '<(google_tv)', 'enable_app_list%': '<(enable_app_list)', 'enable_message_center%': '<(enable_message_center)', 'use_default_render_theme%': '<(use_default_render_theme)', @@ -1692,6 +1697,9 @@ ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], + ['google_tv==1', { + 'defines': ['GOOGLE_TV=1'], + }], ['use_xi2_mt!=0', { 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], }], diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc index 3b9637d..073a59b 100644 --- a/chrome/browser/android/chrome_startup_flags.cc +++ b/chrome/browser/android/chrome_startup_flags.cc @@ -12,6 +12,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "chrome/common/chrome_switches.h" +#include "media/base/media_switches.h" namespace { @@ -40,4 +41,7 @@ void SetChromeSpecificCommandLineFlags() { SetCommandLineSwitchASCII( switches::kPrerenderFromOmnibox, switches::kPrerenderFromOmniboxSwitchValueEnabled); +#if defined(GOOGLE_TV) + SetCommandLineSwitch(switches::kEnableEncryptedMedia); +#endif } |