Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 77beb3f09121a82cc827c8d589a712c9733b03bc..9fc148e946323dcf32e4a4bafd4323807268973a 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 android tv device. |
Yaron
2013/01/24 00:32:29
"google" (i.e. be consistent)
kjyoun
2013/01/24 00:55:46
Done.
|
+ '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"', { |
iannucci
2013/01/23 23:56:27
why not just
google_tv!=1 or OS=="ios"
kjyoun
2013/01/24 00:55:46
We need to check android device,
since google_tv =
|
'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)'], |
}], |