From 574fe4d944298ad23caae547a17f613e645b23b2 Mon Sep 17 00:00:00 2001
From: Pete Miller <miller.pete@gmail.com>
Date: Thu, 25 Jun 2020 15:29:43 -0700
Subject: [PATCH] Remove unneccessary resource compilation from android

- Settings
- NTP
- Welcome
---
 browser/ui/BUILD.gn                            | 18 +++++++++---------
 .../webui/brave_web_ui_controller_factory.cc   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn
index 1ec6405bfa45..10a678828131 100644
--- a/browser/ui/BUILD.gn
+++ b/browser/ui/BUILD.gn
@@ -32,10 +32,6 @@ source_set("ui") {
     "webui/brave_adblock_ui.h",
     "webui/webcompat_reporter_ui.cc",
     "webui/webcompat_reporter_ui.h",
-    "webui/brave_new_tab_message_handler.cc",
-    "webui/brave_new_tab_message_handler.h",
-    "webui/brave_new_tab_ui.cc",
-    "webui/brave_new_tab_ui.h",
     "webui/brave_web_ui_controller_factory.cc",
     "webui/brave_web_ui_controller_factory.h",
     "webui/brave_webui_source.cc",
@@ -69,10 +65,16 @@ source_set("ui") {
       "tabs/brave_tab_menu_model.h",
       "toolbar/brave_app_menu_model.cc",
       "toolbar/brave_app_menu_model.h",
+      "webui/brave_new_tab_message_handler.cc",
+      "webui/brave_new_tab_message_handler.h",
+      "webui/brave_new_tab_ui.cc",
+      "webui/brave_new_tab_ui.h",
       "webui/brave_settings_ui.cc",
       "webui/brave_settings_ui.h",
       "webui/navigation_bar_data_provider.cc",
       "webui/navigation_bar_data_provider.h",
+      "webui/brave_welcome_ui.cc",
+      "webui/brave_welcome_ui.h",
       "webui/settings/brave_about_handler.cc",
       "webui/settings/brave_about_handler.h",
       "webui/settings/brave_appearance_handler.cc",
@@ -151,8 +153,6 @@ source_set("ui") {
       "views/profiles/brave_incognito_menu_view.h",
       "views/profiles/brave_profile_menu_view.cc",
       "views/profiles/brave_profile_menu_view.h",
-      "webui/brave_welcome_ui.cc",
-      "webui/brave_welcome_ui.h",
     ]
   }
 
@@ -180,21 +180,18 @@ source_set("ui") {
     "//brave/browser/devtools",
     "//brave/browser/gcm_driver",
     "//brave/browser/profiles",
-    "//brave/browser/resources/settings:resources",
     "//brave/browser/tor",
     "//brave/common",
     "//brave/common:pref_names",
     "//brave/common/tor",
     "//brave/components/brave_adblock_ui:generated_resources",
     "//brave/components/webcompat_reporter/ui:generated_resources",
-    "//brave/components/brave_new_tab_ui:generated_resources",
     "//brave/components/brave_ads/browser",
     "//brave/components/brave_rewards/browser",
     "//brave/components/brave_rewards/resources",
     "//brave/components/brave_shields/browser",
     "//brave/components/brave_wallet/browser/buildflags:buildflags",
     "//brave/components/brave_wayback_machine:buildflags",
-    "//brave/components/brave_welcome_ui:generated_resources",
     "//brave/components/l10n/browser",
     "//brave/components/l10n/common",
     "//brave/components/ntp_background_images/browser",
@@ -240,8 +237,11 @@ source_set("ui") {
     deps += [
       "//brave/app:brave_generated_resources_grit",
       "//brave/browser:version_info",
+      "//brave/browser/resources/settings:resources",
       "//brave/browser/ui/bookmark",
       "//brave/components/brave_sync",
+      "//brave/components/brave_new_tab_ui:generated_resources",
+      "//brave/components/brave_welcome_ui:generated_resources",
       "//components/sync_device_info",
       "//third_party/blink/public/common",
     ]
diff --git a/browser/ui/webui/brave_web_ui_controller_factory.cc b/browser/ui/webui/brave_web_ui_controller_factory.cc
index 1f0adf5dfd4d..4e742a6cb0c8 100644
--- a/browser/ui/webui/brave_web_ui_controller_factory.cc
+++ b/browser/ui/webui/brave_web_ui_controller_factory.cc
@@ -11,7 +11,6 @@
 #include "base/memory/ptr_util.h"
 #include "brave/browser/ui/webui/brave_adblock_ui.h"
 #include "brave/browser/ui/webui/webcompat_reporter_ui.h"
-#include "brave/browser/ui/webui/brave_new_tab_ui.h"
 #include "brave/common/brave_features.h"
 #include "brave/common/pref_names.h"
 #include "brave/common/webui_url_constants.h"
@@ -23,6 +22,7 @@
 #include "url/gurl.h"
 
 #if !defined(OS_ANDROID)
+#include "brave/browser/ui/webui/brave_new_tab_ui.h"
 #include "brave/browser/ui/webui/brave_settings_ui.h"
 #include "brave/browser/ui/webui/brave_welcome_ui.h"
 #endif
@@ -79,9 +79,9 @@ WebUIController* NewWebUI<BasicUI>(WebUI* web_ui, const GURL& url) {
     return new BraveWelcomeUI(web_ui, url.host());
   } else if (host == chrome::kChromeUISettingsHost) {
     return new BraveSettingsUI(web_ui, url.host());
-#endif  // !defined(OS_ANDROID)
   } else if (host == chrome::kChromeUINewTabHost) {
     return new BraveNewTabUI(web_ui, url.host());
+#endif  // !defined(OS_ANDROID)
   }
   return nullptr;
 }