diff --git a/patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch b/patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch index aa7bcf1e..9dc96f2b 100644 --- a/patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch +++ b/patches/BRM063_Add-export-button-to-Bookmarks-activity-page.patch @@ -12,7 +12,8 @@ Subject: Add export button to Bookmarks activity page chrome/browser/BUILD.gn | 4 ++-- chrome/browser/android/bookmarks/bookmark_bridge.cc | 13 +++++++++++++ chrome/browser/android/bookmarks/bookmark_bridge.h | 3 +++ - 9 files changed, 54 insertions(+), 2 deletions(-) + chrome/utility/BUILD.gn | 7 +++++-- + 10 files changed, 59 insertions(+), 4 deletions(-) diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml --- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml @@ -141,15 +142,15 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1881,6 +1881,8 @@ jumbo_split_static_library("browser") { - if (is_android) { - sources += [ - "after_startup_task_utils_android.cc", -+ "bookmarks/bookmark_html_writer.cc", -+ "bookmarks/bookmark_html_writer.h", - "android/accessibility/font_size_prefs_android.cc", - "android/accessibility/font_size_prefs_android.h", - "android/android_theme_resources.h", +@@ -135,6 +135,8 @@ jumbo_split_static_library("browser") { + "bitmap_fetcher/bitmap_fetcher_service.h", + "bitmap_fetcher/bitmap_fetcher_service_factory.cc", + "bitmap_fetcher/bitmap_fetcher_service_factory.h", ++ "bookmarks/bookmark_html_writer.cc", ++ "bookmarks/bookmark_html_writer.h", + "bookmarks/bookmark_model_factory.cc", + "bookmarks/bookmark_model_factory.h", + "bookmarks/bookmark_stats.cc", @@ -2422,8 +2424,6 @@ jumbo_split_static_library("browser") { "banners/app_banner_infobar_delegate_desktop.h", "banners/app_banner_manager_desktop.cc", @@ -205,6 +206,30 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser void SetBookmarkTitle(JNIEnv* env, const base::android::JavaParamRef& obj, jlong id, +diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn +--- a/chrome/utility/BUILD.gn ++++ b/chrome/utility/BUILD.gn +@@ -55,8 +55,6 @@ static_library("utility") { + + if (!is_android) { + sources += [ +- "importer/bookmark_html_reader.cc", +- "importer/bookmark_html_reader.h", + "importer/bookmarks_file_importer.cc", + "importer/bookmarks_file_importer.h", + "importer/edge_database_reader_win.cc", +@@ -160,6 +158,11 @@ static_library("utility") { + ] + } + ++ sources += [ ++ "importer/bookmark_html_reader.cc", ++ "importer/bookmark_html_reader.h", ++ ] ++ + if (use_nss_certs) { + sources += [ + "importer/nss_decryptor_system_nss.cc", -- 2.7.4 diff --git a/patches/BRM086_Fixup-build-also-html-reader-for-bookmark-imports.patch b/patches/BRM086_Fixup-build-also-html-reader-for-bookmark-imports.patch deleted file mode 100644 index 7e520929..00000000 --- a/patches/BRM086_Fixup-build-also-html-reader-for-bookmark-imports.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Thu, 2 Aug 2018 00:40:23 +0200 -Subject: Fixup: build also html reader for bookmark imports - ---- - chrome/browser/BUILD.gn | 4 ++-- - chrome/utility/BUILD.gn | 7 +++++-- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn ---- a/chrome/browser/BUILD.gn -+++ b/chrome/browser/BUILD.gn -@@ -136,6 +136,8 @@ jumbo_split_static_library("browser") { - "bitmap_fetcher/bitmap_fetcher_service.h", - "bitmap_fetcher/bitmap_fetcher_service_factory.cc", - "bitmap_fetcher/bitmap_fetcher_service_factory.h", -+ "bookmarks/bookmark_html_writer.cc", -+ "bookmarks/bookmark_html_writer.h", - "bookmarks/bookmark_model_factory.cc", - "bookmarks/bookmark_model_factory.h", - "bookmarks/bookmark_stats.cc", -@@ -1857,8 +1859,6 @@ jumbo_split_static_library("browser") { - if (is_android) { - sources += [ - "after_startup_task_utils_android.cc", -- "bookmarks/bookmark_html_writer.cc", -- "bookmarks/bookmark_html_writer.h", - "android/accessibility/font_size_prefs_android.cc", - "android/accessibility/font_size_prefs_android.h", - "android/android_theme_resources.h", -diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn ---- a/chrome/utility/BUILD.gn -+++ b/chrome/utility/BUILD.gn -@@ -55,8 +55,6 @@ static_library("utility") { - - if (!is_android) { - sources += [ -- "importer/bookmark_html_reader.cc", -- "importer/bookmark_html_reader.h", - "importer/bookmarks_file_importer.cc", - "importer/bookmarks_file_importer.h", - "importer/edge_database_reader_win.cc", -@@ -160,6 +158,11 @@ static_library("utility") { - ] - } - -+ sources += [ -+ "importer/bookmark_html_reader.cc", -+ "importer/bookmark_html_reader.h", -+ ] -+ - if (use_nss_certs) { - sources += [ - "importer/nss_decryptor_system_nss.cc", --- -2.7.4 -