| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index ca65fc31caa20734aa0cac0868a30544aa2dc8a7..456a9f626444a962c63ff4996f6cc8981824234d 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -228,6 +228,12 @@
|
| 'toolkit_views%': 0,
|
| }],
|
|
|
| + ['OS=="android"', {
|
| + # Whether the Java UI is being used (Java infobars and popups, Java native
|
| + # settings and first run experience, sign-in etc.).
|
| + 'android_java_ui%': 1,
|
| + }],
|
| +
|
| # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS).
|
| ['OS=="mac" or OS=="win" or OS=="linux"', {
|
| 'enable_hidpi%': 1,
|
| @@ -338,6 +344,7 @@
|
| 'enable_hidpi%': '<(enable_hidpi)',
|
| 'enable_topchrome_md%': '<(enable_topchrome_md)',
|
| 'android_channel%': '<(android_channel)',
|
| + 'android_java_ui%': '<(android_java_ui)',
|
| 'use_goma%': '<(use_goma)',
|
| 'gomadir%': '<(gomadir)',
|
| 'enable_app_list%': '<(enable_app_list)',
|
| @@ -1215,6 +1222,7 @@
|
| 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
|
| 'use_system_libjpeg%': '<(use_system_libjpeg)',
|
| 'android_channel%': '<(android_channel)',
|
| + 'android_java_ui%': '<(android_java_ui)',
|
| 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)',
|
| 'gyp_managed_install%': 0,
|
| 'create_standalone_apk%': 1,
|
|
|