From d098ee001ae79da3a9c257347aeaf98e6da258c0 Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Fri, 21 Feb 2025 11:09:13 -0500
Subject: [PATCH] [Android] Modularize bookmarks browser code

Chromium change:
https://chromium.googlesource.com/chromium/src/+/088816e5c47905f8b4e16dd867cddaf24fb4f55f

[bookmarks] Modularize bookmarks browser code

Moved production bookmarks browser code to chrome/browser/bookmarks
directory. Made some small changes along the way to simplify the
process.
* Moved all production bookmarks browser code to module.
* Added a separate target for files that can be modularized now.
* Added a separate gni list for files that can't be modularized now
  which is included in chrome_java directly. Over time I will refactor
  those files so that they are moved into the main modularized target.
* Merged ReadingListUtils and BookmarkUtils. In the long run, browser
  reading list code shouldn't really exist since the concepts are
  merged at the native level.
* Moved one method from BookmarkUtils to BookmarkModel to allow for
  more files to be modularized.

Eventually some files, particularly implementations of interfaces
defined in chrome/browser/bookmarks, will live in the unmodularized
directory.

Bug: 395908100
---
 build/android/bytecode/bytecode_rewriter.gni | 1 +
 test/BUILD.gn                                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/build/android/bytecode/bytecode_rewriter.gni b/build/android/bytecode/bytecode_rewriter.gni
index 07fb46db65a0..b90f2e1d8ffe 100644
--- a/build/android/bytecode/bytecode_rewriter.gni
+++ b/build/android/bytecode/bytecode_rewriter.gni
@@ -22,6 +22,7 @@ brave_bytecode_jars = [
   "obj/chrome/android/base_module_java.javac.jar",
   "obj/chrome/android/chrome_java.javac.jar",
   "obj/chrome/android/features/tab_ui/java.javac.jar",
+  "obj/chrome/browser/bookmarks/android/java.javac.jar",
   "obj/chrome/browser/download/internal/android/java.javac.jar",
   "obj/chrome/browser/flags/java.javac.jar",
   "obj/chrome/browser/hub/internal/java.javac.jar",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 249e6b89674d..9e13adde5c7f 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -1289,6 +1289,7 @@ if (is_android) {
       "//chrome/browser/android/browserservices/intents:java",
       "//chrome/browser/android/lifecycle:java",
       "//chrome/browser/back_press/android:java",
+      "//chrome/browser/bookmarks/android:java",
       "//chrome/browser/browser_controls/android:java",
       "//chrome/browser/contextmenu:java",
       "//chrome/browser/data_sharing:data_sharing_public_java",