Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 23ad9b88 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Enable search engine settings desktop ui: fix deps section

parent 8157ce8a

build/patches/Enable-search-engine-settings-desktop-ui.patch

+6 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
 .../browser/search_engines/android/BUILD.gn   |   1 +

 .../java/res/layout/search_engine_layout.xml  |  25 ++

 .../settings/SearchEngineSettings.java        |  21 ++

 chrome/browser/ui/BUILD.gn                    |  18 ++

 chrome/browser/ui/BUILD.gn                    |  21 ++

 .../edit_search_engine_controller.cc          |   8 +-

 .../edit_search_engine_controller.h           |   6 +-

 .../keyword_editor_controller.cc              |  13 +-
@@ -77,7 +77,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
 ui/webui/resources/images/BUILD.gn            |   2 +-

 ui/webui/resources/js/BUILD.gn                |   2 +-

 ui/webui/resources/js/load_time_data.ts       |  17 +-

 70 files changed, 1153 insertions(+), 69 deletions(-)

 70 files changed, 1156 insertions(+), 69 deletions(-)

 create mode 100644 chrome/app/settings_strings_android.grdp

 create mode 100644 chrome/browser/search_engines/android/java/res/layout/search_engine_layout.xml

 create mode 100644 chrome/browser/ui/webui/settings/settings_localized_strings_provider_android.cc
@@ -916,7 +916,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn 
   if (is_chrome_branded) {

     deps += [ "//components/plus_addresses/resources:vector_icons" ]

   }

@@ -978,6 +984,18 @@ static_library("ui") {

@@ -978,6 +984,21 @@ static_library("ui") {

     # TODO(b/335257259): Resolve circular deps.

     # Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".

     allow_circular_includes_from += [ "//chrome/browser/facilitated_payments" ]
@@ -931,6 +931,9 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn 
+      "webui/settings/settings_localized_strings_provider_android.h",

+      "webui/favicon_source.cc",

+      "webui/favicon_source.h",

+    ]

+    deps += [

+      "//chrome/browser/search/background:ntp_background_proto",

+    ]

   } else {

     # !is_android

build/patches/eyeo-133.0.6943.49-android_api.patch

+3 −3
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ new file mode 100644 
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn

--- a/chrome/browser/ui/BUILD.gn

+++ b/chrome/browser/ui/BUILD.gn

@@ -1000,6 +1000,12 @@ static_library("ui") {

       "webui/favicon_source.cc",

       "webui/favicon_source.h",

@@ -1003,6 +1003,12 @@ static_library("ui") {

     deps += [

       "//chrome/browser/search/background:ntp_background_proto",

     ]

+    ### Android API module start

+    deps += [