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

Unified Diff: build/common.gypi

Issue 12026010: Add GOOGLE_TV build tag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 77beb3f09121a82cc827c8d589a712c9733b03bc..fce3073ecd58da69964c5a82070646d209acea3d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -110,6 +110,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)',
@@ -526,7 +530,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,
@@ -719,6 +723,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)',
@@ -1652,6 +1657,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)'],
}],
« no previous file with comments | « no previous file | content/browser/android/content_startup_flags.cc » ('j') | content/browser/android/content_startup_flags.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698