Android: Allow compiling browser without Java UI

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index fdddd1c95580184a5ebec1ee40c7f81643f521d0..d2d337608b6404e532224e11550e41045d5de338 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -15,8 +15,6 @@
       'browser/ui/android/android_about_app_info.h',
       'browser/ui/android/external_protocol_dialog_android.cc',
       'browser/ui/android/status_tray_android.cc',

[mfomitchev, 2015/11/19 15:41:05]

Should status_tray_android.cc and android_about_app_info.cc also be moved to
chrome_browser_ui_android_java_ui_sources?

-      'browser/ui/android/tab_model/tab_model_list.cc',
-      'browser/ui/android/tab_model/tab_model_list.h',
       'browser/ui/app_list/app_list_util.cc',
       'browser/ui/app_list/app_list_util.h',
       # All other browser/ui/app_list files go in chrome_browser_ui_app_list_sources.
@@ -423,7 +421,7 @@
       'browser/ui/zoom/chrome_zoom_level_prefs.cc',
       'browser/ui/zoom/chrome_zoom_level_prefs.h',
     ],
-    'chrome_browser_ui_android_non_aura_sources': [
+    'chrome_browser_ui_android_java_ui_sources': [

[mfomitchev, 2015/11/19 15:41:05]

This name becomes confusing. There's two "ui"s in the name, but they have
different meaning, and it's hard to understand it, unless you know what's going
on already. We also have chrome_browser_android_java_ui_sources, which could
easily be confused with this source set. Perhaps we should avoid using "java_ui"
in source set names. I don't have any good suggestions, but IMHO even
chrome_browser_ui_android_non_aura_sources was easier to read/understand, even
though it was less accurate.

       'browser/ui/android/autofill/autofill_dialog_controller_android.cc',
       'browser/ui/android/autofill/autofill_dialog_controller_android.h',
       'browser/ui/android/autofill/autofill_dialog_result.cc',
@@ -492,6 +490,8 @@
       'browser/ui/android/tab_model/tab_model.h',
       'browser/ui/android/tab_model/tab_model_jni_bridge.cc',
       'browser/ui/android/tab_model/tab_model_jni_bridge.h',
+      'browser/ui/android/tab_model/tab_model_list.cc',
+      'browser/ui/android/tab_model/tab_model_list.h',
       'browser/ui/android/website_settings_popup_android.cc',
       'browser/ui/android/website_settings_popup_android.h',
       'browser/ui/android/window_android_helper.cc',
@@ -3043,11 +3043,15 @@
             '../third_party/boringssl/boringssl.gyp:boringssl',
             'chrome_browser_jni_headers',
           ],
-          'dependencies!': [
-             '../ui/events/events.gyp:events',
-             'chrome_browser_ui_views.gyp:browser_ui_views',
+          'conditions': [
+            ['android_java_ui == 1', {
+              'sources': [ '<@(chrome_browser_ui_android_java_ui_sources)' ],
+              'dependencies!': [
+                '../ui/events/events.gyp:events',
+                'chrome_browser_ui_views.gyp:browser_ui_views',
+              ],
+            }]
           ],
-          'sources': [ '<@(chrome_browser_ui_android_non_aura_sources)' ],
         }],
         ['OS=="mac"', {
           'sources': [ '<@(chrome_browser_ui_mac_sources)' ],