Android: Allow compiling browser without Java UI

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 62e9b1160cc8dde940bfd1b096a0e5fc785a7620..f775f6fd49c71b3e0c178d1196244447ac591f6d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -24,260 +24,6 @@
       'browser/after_startup_task_utils.h',
       'browser/after_startup_task_utils_android.cc',
       'browser/after_startup_task_utils_android.h',
-      'browser/android/accessibility/font_size_prefs_android.cc',
-      'browser/android/accessibility/font_size_prefs_android.h',
-      'browser/android/accessibility_util.cc',
-      'browser/android/accessibility_util.h',
-      'browser/android/activity_type_ids.cc',
-      'browser/android/activity_type_ids.h',
-      'browser/android/android_theme_resources.h',
-      'browser/android/appmenu/app_menu_drag_helper.cc',
-      'browser/android/appmenu/app_menu_drag_helper.h',
-      'browser/android/banners/app_banner_data_fetcher_android.cc',
-      'browser/android/banners/app_banner_data_fetcher_android.h',
-      'browser/android/banners/app_banner_infobar_delegate_android.cc',
-      'browser/android/banners/app_banner_infobar_delegate_android.h',
-      'browser/android/banners/app_banner_manager_android.cc',
-      'browser/android/banners/app_banner_manager_android.h',
-      'browser/android/bookmarks/bookmarks_bridge.cc',
-      'browser/android/bookmarks/bookmarks_bridge.h',
-      'browser/android/bookmarks/edit_bookmark_helper.cc',
-      'browser/android/bookmarks/edit_bookmark_helper.h',
-      'browser/android/bookmarks/partner_bookmarks_reader.cc',
-      'browser/android/bookmarks/partner_bookmarks_reader.h',
-      'browser/android/bookmarks/partner_bookmarks_shim.cc',
-      'browser/android/bookmarks/partner_bookmarks_shim.h',
-      'browser/android/bottombar/overlay_panel_content.cc',
-      'browser/android/bottombar/overlay_panel_content.h',
-      'browser/android/chrome_application.cc',
-      'browser/android/chrome_application.h',
-      'browser/android/chrome_jni_registrar.cc',
-      'browser/android/chrome_jni_registrar.h',
-      'browser/android/chrome_media_client_android.cc',
-      'browser/android/chrome_media_client_android.h',
-      'browser/android/chrome_startup_flags.cc',
-      'browser/android/chrome_startup_flags.h',
-      'browser/android/compositor/compositor_view.cc',
-      'browser/android/compositor/compositor_view.h',
-      'browser/android/compositor/decoration_title.cc',
-      'browser/android/compositor/decoration_title.h',
-      'browser/android/compositor/layer/content_layer.cc',
-      'browser/android/compositor/layer/content_layer.h',
-      'browser/android/compositor/layer/contextual_search_layer.cc',
-      'browser/android/compositor/layer/contextual_search_layer.h',
-      'browser/android/compositor/layer/crushed_sprite_layer.cc',
-      'browser/android/compositor/layer/crushed_sprite_layer.h',
-      'browser/android/compositor/layer/layer.h',
-      'browser/android/compositor/layer/tab_handle_layer.cc',
-      'browser/android/compositor/layer/tab_handle_layer.h',
-      'browser/android/compositor/layer/tab_layer.cc',
-      'browser/android/compositor/layer/tab_layer.h',
-      'browser/android/compositor/layer/thumbnail_layer.cc',
-      'browser/android/compositor/layer/thumbnail_layer.h',
-      'browser/android/compositor/layer/toolbar_layer.cc',
-      'browser/android/compositor/layer/toolbar_layer.h',
-      'browser/android/compositor/layer_title_cache.cc',
-      'browser/android/compositor/layer_title_cache.h',
-      'browser/android/compositor/scene_layer/contextual_search_scene_layer.cc',
-      'browser/android/compositor/scene_layer/contextual_search_scene_layer.h',
-      'browser/android/compositor/scene_layer/scene_layer.cc',
-      'browser/android/compositor/scene_layer/scene_layer.h',
-      'browser/android/compositor/scene_layer/static_tab_scene_layer.cc',
-      'browser/android/compositor/scene_layer/static_tab_scene_layer.h',
-      'browser/android/compositor/scene_layer/tab_list_scene_layer.cc',
-      'browser/android/compositor/scene_layer/tab_list_scene_layer.h',
-      'browser/android/compositor/scene_layer/tab_strip_scene_layer.cc',
-      'browser/android/compositor/scene_layer/tab_strip_scene_layer.h',
-      'browser/android/compositor/tab_content_manager.cc',
-      'browser/android/compositor/tab_content_manager.h',
-      'browser/android/contextualsearch/contextual_search_context.cc',
-      'browser/android/contextualsearch/contextual_search_context.h',
-      'browser/android/contextualsearch/contextual_search_delegate.cc',
-      'browser/android/contextualsearch/contextual_search_delegate.h',
-      'browser/android/contextualsearch/contextual_search_manager.cc',
-      'browser/android/contextualsearch/contextual_search_manager.h',
-      'browser/android/contextualsearch/contextual_search_tab_helper.cc',
-      'browser/android/contextualsearch/contextual_search_tab_helper.h',
-      'browser/android/contextualsearch/resolved_search_term.cc',
-      'browser/android/contextualsearch/resolved_search_term.h',
-      'browser/android/cookies/cookies_fetcher.cc',
-      'browser/android/cookies/cookies_fetcher.h',
-      'browser/android/data_usage/data_use_tab_model.cc',
-      'browser/android/data_usage/data_use_tab_model.h',
-      'browser/android/data_usage/data_use_tab_helper.cc',
-      'browser/android/data_usage/data_use_tab_helper.h',
-      'browser/android/data_usage/data_use_ui_tab_model.cc',
-      'browser/android/data_usage/data_use_ui_tab_model.h',
-      'browser/android/data_usage/data_use_ui_tab_model_factory.cc',
-      'browser/android/data_usage/data_use_ui_tab_model_factory.h',
-      'browser/android/data_usage/external_data_use_observer.cc',
-      'browser/android/data_usage/external_data_use_observer.h',
-      'browser/android/data_usage/tab_data_use_entry.cc',
-      'browser/android/data_usage/tab_data_use_entry.h',
-      'browser/android/dev_tools_discovery_provider_android.cc',
-      'browser/android/dev_tools_discovery_provider_android.h',
-      'browser/android/dev_tools_server.cc',
-      'browser/android/dev_tools_server.h',
-      'browser/android/document/document_web_contents_delegate.cc',
-      'browser/android/dom_distiller/distiller_ui_handle_android.cc',
-      'browser/android/dom_distiller/distiller_ui_handle_android.h',
-      'browser/android/download/android_download_manager_overwrite_infobar_delegate.cc',
-      'browser/android/download/android_download_manager_overwrite_infobar_delegate.h',
-      'browser/android/download/chrome_download_delegate.cc',
-      'browser/android/download/chrome_download_delegate.h',
-      'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.cc',
-      'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h',
-      'browser/android/download/download_overwrite_infobar_delegate.cc',
-      'browser/android/download/download_overwrite_infobar_delegate.h',
-      'browser/android/download/mock_download_controller_android.cc',
-      'browser/android/download/mock_download_controller_android.h',
-      'browser/android/favicon_helper.cc',
-      'browser/android/favicon_helper.h',
-      'browser/android/feature_utilities.cc',
-      'browser/android/feature_utilities.h',
-      'browser/android/feedback/connectivity_checker.cc',
-      'browser/android/feedback/connectivity_checker.h',
-      'browser/android/feedback/screenshot_task.cc',
-      'browser/android/feedback/screenshot_task.h',
-      'browser/android/find_in_page/find_in_page_bridge.cc',
-      'browser/android/find_in_page/find_in_page_bridge.h',
-      'browser/android/foreign_session_helper.cc',
-      'browser/android/foreign_session_helper.h',
-      'browser/android/fullscreen/fullscreen_infobar_delegate.cc',
-      'browser/android/fullscreen/fullscreen_infobar_delegate.h',
-      'browser/android/history_report/data_observer.cc',
-      'browser/android/history_report/data_observer.h',
-      'browser/android/history_report/data_provider.cc',
-      'browser/android/history_report/data_provider.h',
-      'browser/android/history_report/delta_file_backend_leveldb.cc',
-      'browser/android/history_report/delta_file_backend_leveldb.h',
-      'browser/android/history_report/delta_file_commons.cc',
-      'browser/android/history_report/delta_file_commons.h',
-      'browser/android/history_report/delta_file_service.cc',
-      'browser/android/history_report/delta_file_service.h',
-      'browser/android/history_report/get_all_urls_from_history_task.cc',
-      'browser/android/history_report/get_all_urls_from_history_task.h',
-      'browser/android/history_report/historic_visits_migration_task.cc',
-      'browser/android/history_report/historic_visits_migration_task.h',
-      'browser/android/history_report/history_report_jni_bridge.cc',
-      'browser/android/history_report/history_report_jni_bridge.h',
-      'browser/android/history_report/usage_report_util.cc',
-      'browser/android/history_report/usage_report_util.h',
-      'browser/android/history_report/usage_reports_buffer_backend.cc',
-      'browser/android/history_report/usage_reports_buffer_backend.h',
-      'browser/android/history_report/usage_reports_buffer_service.cc',
-      'browser/android/history_report/usage_reports_buffer_service.h',
-      'browser/android/hung_renderer_infobar_delegate.cc',
-      'browser/android/hung_renderer_infobar_delegate.h',
-      'browser/android/intent_helper.cc',
-      'browser/android/intent_helper.h',
-      'browser/android/intercept_download_resource_throttle.cc',
-      'browser/android/intercept_download_resource_throttle.h',
-      'browser/android/java_exception_reporter.cc',
-      'browser/android/java_exception_reporter.h',
-      'browser/android/large_icon_bridge.cc',
-      'browser/android/large_icon_bridge.h',
-      'browser/android/location_settings.h',
-      'browser/android/location_settings_impl.cc',
-      'browser/android/location_settings_impl.h',
-      'browser/android/logo_bridge.cc',
-      'browser/android/logo_bridge.h',
-      'browser/android/logo_service.cc',
-      'browser/android/logo_service.h',
-      'browser/android/media/media_throttle_infobar_delegate.cc',
-      'browser/android/media/media_throttle_infobar_delegate.h',
-      'browser/android/metrics/launch_metrics.cc',
-      'browser/android/metrics/launch_metrics.h',
-      'browser/android/metrics/uma_session_stats.cc',
-      'browser/android/metrics/uma_session_stats.h',
-      'browser/android/metrics/uma_utils.cc',
-      'browser/android/metrics/uma_utils.h',
-      'browser/android/metrics/variations_session.cc',
-      'browser/android/metrics/variations_session.h',
-      'browser/android/most_visited_sites.cc',
-      'browser/android/most_visited_sites.h',
-      'browser/android/net/external_estimate_provider_android.cc',
-      'browser/android/net/external_estimate_provider_android.h',
-      'browser/android/new_tab_page_prefs.cc',
-      'browser/android/new_tab_page_prefs.h',
-      'browser/android/new_tab_page_url_handler.cc',
-      'browser/android/new_tab_page_url_handler.h',
-      'browser/android/omnibox/answers_image_bridge.cc',
-      'browser/android/omnibox/answers_image_bridge.h',
-      'browser/android/omnibox/autocomplete_controller_android.cc',
-      'browser/android/omnibox/autocomplete_controller_android.h',
-      'browser/android/omnibox/omnibox_prerender.cc',
-      'browser/android/omnibox/omnibox_prerender.h',
-      'browser/android/password_ui_view_android.cc',
-      'browser/android/password_ui_view_android.h',
-      'browser/android/popular_sites.cc',
-      'browser/android/popular_sites.h',
-      'browser/android/precache/precache_launcher.cc',
-      'browser/android/precache/precache_launcher.h',
-      'browser/android/preferences/autofill/autofill_profile_bridge.cc',
-      'browser/android/preferences/autofill/autofill_profile_bridge.h',
-      'browser/android/preferences/pref_service_bridge.cc',
-      'browser/android/preferences/pref_service_bridge.h',
-      'browser/android/preferences/website_preference_bridge.cc',
-      'browser/android/preferences/website_preference_bridge.h',
-      'browser/android/profiles/profile_downloader_android.cc',
-      'browser/android/profiles/profile_downloader_android.h',
-      'browser/android/provider/blocking_ui_thread_async_request.cc',
-      'browser/android/provider/blocking_ui_thread_async_request.h',
-      'browser/android/provider/bookmark_model_observer_task.cc',
-      'browser/android/provider/bookmark_model_observer_task.h',
-      'browser/android/provider/chrome_browser_provider.cc',
-      'browser/android/provider/chrome_browser_provider.h',
-      'browser/android/provider/run_on_ui_thread_blocking.h',
-      'browser/android/rappor/rappor_service_bridge.cc',
-      'browser/android/rappor/rappor_service_bridge.h',
-      'browser/android/recently_closed_tabs_bridge.cc',
-      'browser/android/recently_closed_tabs_bridge.h',
-      'browser/android/resource_id.h',
-      'browser/android/resource_mapper.cc',
-      'browser/android/resource_mapper.h',
-      'browser/android/rlz/revenue_stats.cc',
-      'browser/android/rlz/revenue_stats.h',
-      'browser/android/seccomp_support_detector.cc',
-      'browser/android/seccomp_support_detector.h',
-      'browser/android/sessions/session_tab_helper_android.cc',
-      'browser/android/sessions/session_tab_helper_android.h',
-      'browser/android/shortcut_helper.cc',
-      'browser/android/shortcut_helper.h',
-      'browser/android/shortcut_info.cc',
-      'browser/android/shortcut_info.h',
-      'browser/android/signin/account_management_screen_helper.cc',
-      'browser/android/signin/account_management_screen_helper.h',
-      'browser/android/signin/account_tracker_service_android.cc',
-      'browser/android/signin/account_tracker_service_android.h',
-      'browser/android/signin/signin_manager_android.cc',
-      'browser/android/signin/signin_manager_android.h',
-      'browser/android/tab_android.cc',
-      'browser/android/tab_android.h',
-      'browser/android/tab_state.cc',
-      'browser/android/tab_state.h',
-      'browser/android/tab_web_contents_delegate_android.cc',
-      'browser/android/tab_web_contents_delegate_android.h',
-      'browser/android/thumbnail/thumbnail.cc',
-      'browser/android/thumbnail/thumbnail.h',
-      'browser/android/thumbnail/thumbnail_cache.cc',
-      'browser/android/thumbnail/thumbnail_cache.h',
-      'browser/android/url_utilities.cc',
-      'browser/android/url_utilities.h',
-      'browser/android/voice_search_tab_helper.cc',
-      'browser/android/voice_search_tab_helper.h',
-      'browser/android/warmup_manager.cc',
-      'browser/android/warmup_manager.h',
-      'browser/android/web_contents_factory.cc',
-      'browser/android/web_contents_factory.h',
-      'browser/android/webapps/add_to_homescreen_data_fetcher.cc',
-      'browser/android/webapps/add_to_homescreen_data_fetcher.h',
-      'browser/android/webapps/add_to_homescreen_dialog_helper.cc',
-      'browser/android/webapps/add_to_homescreen_dialog_helper.h',
-      'browser/android/webapps/single_tab_mode_tab_helper.cc',
-      'browser/android/webapps/single_tab_mode_tab_helper.h',
-      'browser/android/webapps/webapp_registry.cc',
-      'browser/android/webapps/webapp_registry.h',
       'browser/app_controller_mac.h',
       'browser/app_controller_mac.mm',
       'browser/app_icon_win.cc',
@@ -877,11 +623,265 @@
       'browser/web_data_service_factory.cc',
       'browser/web_data_service_factory.h',
     ],
-    'chrome_browser_android_sources': [
+    'chrome_browser_android_java_ui_sources': [

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

It's worth noting we were excluding less in auraclank2 for the Aura Android
build. We weren't excluding chrome_browser_android_sources, we weren't excluding
chrome_jni_registrar.cc, etc. It's probably the right thing to do, although I am
a little concerned that we are creating a new configuration, different from what
we have in the branch, and upstreaming will be more difficult and less
parallelizable because of that.

+      'browser/android/accessibility/font_size_prefs_android.cc',
+      'browser/android/accessibility/font_size_prefs_android.h',
+      'browser/android/accessibility_util.cc',
+      'browser/android/accessibility_util.h',
+      'browser/android/activity_type_ids.cc',
+      'browser/android/activity_type_ids.h',
+      'browser/android/android_theme_resources.h',
+      'browser/android/appmenu/app_menu_drag_helper.cc',
+      'browser/android/appmenu/app_menu_drag_helper.h',
       'browser/android/background_sync_launcher_android.cc',
       'browser/android/background_sync_launcher_android.h',
+      'browser/android/banners/app_banner_data_fetcher_android.cc',
+      'browser/android/banners/app_banner_data_fetcher_android.h',
+      'browser/android/banners/app_banner_infobar_delegate_android.cc',
+      'browser/android/banners/app_banner_infobar_delegate_android.h',
+      'browser/android/banners/app_banner_manager_android.cc',
+      'browser/android/banners/app_banner_manager_android.h',
+      'browser/android/bookmarks/bookmarks_bridge.cc',
+      'browser/android/bookmarks/bookmarks_bridge.h',
+      'browser/android/bookmarks/edit_bookmark_helper.cc',
+      'browser/android/bookmarks/edit_bookmark_helper.h',
+      'browser/android/bookmarks/partner_bookmarks_reader.cc',
+      'browser/android/bookmarks/partner_bookmarks_reader.h',
+      'browser/android/bookmarks/partner_bookmarks_shim.cc',
+      'browser/android/bookmarks/partner_bookmarks_shim.h',
+      'browser/android/bottombar/overlay_panel_content.cc',
+      'browser/android/bottombar/overlay_panel_content.h',
+      'browser/android/chrome_application.cc',
+      'browser/android/chrome_application.h',
+      'browser/android/chrome_jni_registrar.cc',
+      'browser/android/chrome_jni_registrar.h',
+      'browser/android/chrome_media_client_android.cc',
+      'browser/android/chrome_media_client_android.h',
+      'browser/android/chrome_startup_flags.cc',
+      'browser/android/chrome_startup_flags.h',
+      'browser/android/compositor/compositor_view.cc',
+      'browser/android/compositor/compositor_view.h',
+      'browser/android/compositor/decoration_title.cc',
+      'browser/android/compositor/decoration_title.h',
+      'browser/android/compositor/layer/content_layer.cc',
+      'browser/android/compositor/layer/content_layer.h',
+      'browser/android/compositor/layer/contextual_search_layer.cc',
+      'browser/android/compositor/layer/contextual_search_layer.h',
+      'browser/android/compositor/layer/crushed_sprite_layer.cc',
+      'browser/android/compositor/layer/crushed_sprite_layer.h',
+      'browser/android/compositor/layer/layer.h',
+      'browser/android/compositor/layer/tab_handle_layer.cc',
+      'browser/android/compositor/layer/tab_handle_layer.h',
+      'browser/android/compositor/layer/tab_layer.cc',
+      'browser/android/compositor/layer/tab_layer.h',
+      'browser/android/compositor/layer/thumbnail_layer.cc',
+      'browser/android/compositor/layer/thumbnail_layer.h',
+      'browser/android/compositor/layer/toolbar_layer.cc',
+      'browser/android/compositor/layer/toolbar_layer.h',
+      'browser/android/compositor/layer_title_cache.cc',
+      'browser/android/compositor/layer_title_cache.h',
+      'browser/android/compositor/scene_layer/contextual_search_scene_layer.cc',
+      'browser/android/compositor/scene_layer/contextual_search_scene_layer.h',
+      'browser/android/compositor/scene_layer/scene_layer.cc',
+      'browser/android/compositor/scene_layer/scene_layer.h',
+      'browser/android/compositor/scene_layer/static_tab_scene_layer.cc',
+      'browser/android/compositor/scene_layer/static_tab_scene_layer.h',
+      'browser/android/compositor/scene_layer/tab_list_scene_layer.cc',
+      'browser/android/compositor/scene_layer/tab_list_scene_layer.h',
+      'browser/android/compositor/scene_layer/tab_strip_scene_layer.cc',
+      'browser/android/compositor/scene_layer/tab_strip_scene_layer.h',
+      'browser/android/compositor/tab_content_manager.cc',
+      'browser/android/compositor/tab_content_manager.h',
+      'browser/android/contextualsearch/contextual_search_context.cc',
+      'browser/android/contextualsearch/contextual_search_context.h',
+      'browser/android/contextualsearch/contextual_search_delegate.cc',
+      'browser/android/contextualsearch/contextual_search_delegate.h',
+      'browser/android/contextualsearch/contextual_search_manager.cc',
+      'browser/android/contextualsearch/contextual_search_manager.h',
+      'browser/android/contextualsearch/contextual_search_tab_helper.cc',
+      'browser/android/contextualsearch/contextual_search_tab_helper.h',
+      'browser/android/contextualsearch/resolved_search_term.cc',
+      'browser/android/contextualsearch/resolved_search_term.h',
+      'browser/android/cookies/cookies_fetcher.cc',
+      'browser/android/cookies/cookies_fetcher.h',
+      'browser/android/data_usage/data_use_tab_helper.cc',
+      'browser/android/data_usage/data_use_tab_helper.h',
+      'browser/android/data_usage/data_use_tab_model.cc',
+      'browser/android/data_usage/data_use_tab_model.h',
       'browser/android/data_usage/data_use_tab_ui_manager_android.cc',
       'browser/android/data_usage/data_use_tab_ui_manager_android.h',
+      'browser/android/data_usage/data_use_ui_tab_model.cc',
+      'browser/android/data_usage/data_use_ui_tab_model.h',
+      'browser/android/data_usage/data_use_ui_tab_model_factory.cc',
+      'browser/android/data_usage/data_use_ui_tab_model_factory.h',
+      'browser/android/data_usage/external_data_use_observer.cc',
+      'browser/android/data_usage/external_data_use_observer.h',
+      'browser/android/data_usage/tab_data_use_entry.cc',
+      'browser/android/data_usage/tab_data_use_entry.h',
+      'browser/android/dev_tools_discovery_provider_android.cc',
+      'browser/android/dev_tools_discovery_provider_android.h',
+      'browser/android/dev_tools_server.cc',
+      'browser/android/dev_tools_server.h',
+      'browser/android/document/document_web_contents_delegate.cc',
+      'browser/android/dom_distiller/distiller_ui_handle_android.cc',
+      'browser/android/dom_distiller/distiller_ui_handle_android.h',
+      'browser/android/download/android_download_manager_overwrite_infobar_delegate.cc',
+      'browser/android/download/android_download_manager_overwrite_infobar_delegate.h',
+      'browser/android/download/chrome_download_delegate.cc',
+      'browser/android/download/chrome_download_delegate.h',
+      'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.cc',
+      'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h',
+      'browser/android/download/download_overwrite_infobar_delegate.cc',
+      'browser/android/download/download_overwrite_infobar_delegate.h',
+      'browser/android/download/mock_download_controller_android.cc',
+      'browser/android/download/mock_download_controller_android.h',
+      'browser/android/favicon_helper.cc',
+      'browser/android/favicon_helper.h',
+      'browser/android/feature_utilities.cc',
+      'browser/android/feature_utilities.h',
+      'browser/android/feedback/connectivity_checker.cc',
+      'browser/android/feedback/connectivity_checker.h',
+      'browser/android/feedback/screenshot_task.cc',
+      'browser/android/feedback/screenshot_task.h',
+      'browser/android/find_in_page/find_in_page_bridge.cc',
+      'browser/android/find_in_page/find_in_page_bridge.h',
+      'browser/android/foreign_session_helper.cc',
+      'browser/android/foreign_session_helper.h',
+      'browser/android/fullscreen/fullscreen_infobar_delegate.cc',
+      'browser/android/fullscreen/fullscreen_infobar_delegate.h',
+      'browser/android/history_report/data_observer.cc',
+      'browser/android/history_report/data_observer.h',
+      'browser/android/history_report/data_provider.cc',
+      'browser/android/history_report/data_provider.h',
+      'browser/android/history_report/delta_file_backend_leveldb.cc',
+      'browser/android/history_report/delta_file_backend_leveldb.h',
+      'browser/android/history_report/delta_file_commons.cc',
+      'browser/android/history_report/delta_file_commons.h',
+      'browser/android/history_report/delta_file_service.cc',
+      'browser/android/history_report/delta_file_service.h',
+      'browser/android/history_report/get_all_urls_from_history_task.cc',
+      'browser/android/history_report/get_all_urls_from_history_task.h',
+      'browser/android/history_report/historic_visits_migration_task.cc',
+      'browser/android/history_report/historic_visits_migration_task.h',
+      'browser/android/history_report/history_report_jni_bridge.cc',
+      'browser/android/history_report/history_report_jni_bridge.h',
+      'browser/android/history_report/usage_report_util.cc',
+      'browser/android/history_report/usage_report_util.h',
+      'browser/android/history_report/usage_reports_buffer_backend.cc',
+      'browser/android/history_report/usage_reports_buffer_backend.h',
+      'browser/android/history_report/usage_reports_buffer_service.cc',
+      'browser/android/history_report/usage_reports_buffer_service.h',
+      'browser/android/hung_renderer_infobar_delegate.cc',
+      'browser/android/hung_renderer_infobar_delegate.h',
+      'browser/android/intent_helper.cc',
+      'browser/android/intent_helper.h',
+      'browser/android/intercept_download_resource_throttle.cc',
+      'browser/android/intercept_download_resource_throttle.h',
+      'browser/android/java_exception_reporter.cc',
+      'browser/android/java_exception_reporter.h',
+      'browser/android/large_icon_bridge.cc',
+      'browser/android/large_icon_bridge.h',
+      'browser/android/location_settings.h',
+      'browser/android/location_settings_impl.cc',
+      'browser/android/location_settings_impl.h',
+      'browser/android/logo_bridge.cc',
+      'browser/android/logo_bridge.h',
+      'browser/android/logo_service.cc',
+      'browser/android/logo_service.h',
+      'browser/android/media/media_throttle_infobar_delegate.cc',
+      'browser/android/media/media_throttle_infobar_delegate.h',
+      'browser/android/metrics/launch_metrics.cc',
+      'browser/android/metrics/launch_metrics.h',
+      'browser/android/metrics/uma_session_stats.cc',
+      'browser/android/metrics/uma_session_stats.h',
+      'browser/android/metrics/uma_utils.cc',
+      'browser/android/metrics/uma_utils.h',
+      'browser/android/metrics/variations_session.cc',
+      'browser/android/metrics/variations_session.h',
+      'browser/android/most_visited_sites.cc',
+      'browser/android/most_visited_sites.h',
+      'browser/android/net/external_estimate_provider_android.cc',
+      'browser/android/net/external_estimate_provider_android.h',
+      'browser/android/new_tab_page_prefs.cc',
+      'browser/android/new_tab_page_prefs.h',
+      'browser/android/new_tab_page_url_handler.cc',
+      'browser/android/new_tab_page_url_handler.h',
+      'browser/android/omnibox/answers_image_bridge.cc',
+      'browser/android/omnibox/answers_image_bridge.h',
+      'browser/android/omnibox/autocomplete_controller_android.cc',
+      'browser/android/omnibox/autocomplete_controller_android.h',
+      'browser/android/omnibox/omnibox_prerender.cc',
+      'browser/android/omnibox/omnibox_prerender.h',
+      'browser/android/password_ui_view_android.cc',
+      'browser/android/password_ui_view_android.h',
+      'browser/android/popular_sites.cc',
+      'browser/android/popular_sites.h',
+      'browser/android/precache/precache_launcher.cc',
+      'browser/android/precache/precache_launcher.h',
+      'browser/android/preferences/autofill/autofill_profile_bridge.cc',
+      'browser/android/preferences/autofill/autofill_profile_bridge.h',
+      'browser/android/preferences/pref_service_bridge.cc',
+      'browser/android/preferences/pref_service_bridge.h',
+      'browser/android/preferences/website_preference_bridge.cc',
+      'browser/android/preferences/website_preference_bridge.h',
+      'browser/android/profiles/profile_downloader_android.cc',
+      'browser/android/profiles/profile_downloader_android.h',
+      'browser/android/provider/blocking_ui_thread_async_request.cc',
+      'browser/android/provider/blocking_ui_thread_async_request.h',
+      'browser/android/provider/bookmark_model_observer_task.cc',
+      'browser/android/provider/bookmark_model_observer_task.h',
+      'browser/android/provider/chrome_browser_provider.cc',
+      'browser/android/provider/chrome_browser_provider.h',
+      'browser/android/provider/run_on_ui_thread_blocking.h',
+      'browser/android/rappor/rappor_service_bridge.cc',
+      'browser/android/rappor/rappor_service_bridge.h',
+      'browser/android/recently_closed_tabs_bridge.cc',
+      'browser/android/recently_closed_tabs_bridge.h',
+      'browser/android/resource_id.h',
+      'browser/android/resource_mapper.cc',
+      'browser/android/resource_mapper.h',
+      'browser/android/rlz/revenue_stats.cc',
+      'browser/android/rlz/revenue_stats.h',
+      'browser/android/seccomp_support_detector.cc',
+      'browser/android/seccomp_support_detector.h',
+      'browser/android/sessions/session_tab_helper_android.cc',
+      'browser/android/sessions/session_tab_helper_android.h',
+      'browser/android/shortcut_helper.cc',
+      'browser/android/shortcut_helper.h',
+      'browser/android/shortcut_info.cc',
+      'browser/android/shortcut_info.h',
+      'browser/android/signin/account_management_screen_helper.cc',
+      'browser/android/signin/account_management_screen_helper.h',
+      'browser/android/signin/account_tracker_service_android.cc',
+      'browser/android/signin/account_tracker_service_android.h',
+      'browser/android/signin/signin_manager_android.cc',
+      'browser/android/signin/signin_manager_android.h',
+      'browser/android/tab_android.cc',
+      'browser/android/tab_android.h',
+      'browser/android/tab_state.cc',
+      'browser/android/tab_state.h',
+      'browser/android/tab_web_contents_delegate_android.cc',
+      'browser/android/tab_web_contents_delegate_android.h',
+      'browser/android/thumbnail/thumbnail.cc',
+      'browser/android/thumbnail/thumbnail.h',
+      'browser/android/thumbnail/thumbnail_cache.cc',
+      'browser/android/thumbnail/thumbnail_cache.h',
+      'browser/android/url_utilities.cc',
+      'browser/android/url_utilities.h',
+      'browser/android/voice_search_tab_helper.cc',
+      'browser/android/voice_search_tab_helper.h',
+      'browser/android/warmup_manager.cc',
+      'browser/android/warmup_manager.h',
+      'browser/android/web_contents_factory.cc',
+      'browser/android/web_contents_factory.h',
+      'browser/android/webapps/add_to_homescreen_data_fetcher.cc',
+      'browser/android/webapps/add_to_homescreen_data_fetcher.h',
+      'browser/android/webapps/add_to_homescreen_dialog_helper.cc',
+      'browser/android/webapps/add_to_homescreen_dialog_helper.h',
+      'browser/android/webapps/single_tab_mode_tab_helper.cc',
+      'browser/android/webapps/single_tab_mode_tab_helper.h',
+      'browser/android/webapps/webapp_registry.cc',
+      'browser/android/webapps/webapp_registry.h',
       'browser/download/download_request_infobar_delegate_android.cc',
       'browser/download/download_request_infobar_delegate_android.h',
       'browser/geolocation/geolocation_infobar_delegate_android.cc',
@@ -3677,10 +3677,14 @@
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
-          'sources': [
-            '<@(chrome_browser_android_sources)',
-            '<@(chrome_browser_bookmark_android_sources)',
-           ],
+          'conditions': [
+            ['android_java_ui == 1', {
+              'sources': [
+                '<@(chrome_browser_android_java_ui_sources)',
+                '<@(chrome_browser_bookmark_android_sources)',
+              ],
+            }],
+          ],
           'defines': [ 'ENABLE_DATA_REDUCTION_PROXY_DEBUGGING' ],
           'conditions': [
             ['use_seccomp_bpf==1', {