From 1d33bdf24c2aa4e6f3a95d551afc7af8db3bc925 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Wed, 22 Apr 2026 12:49:00 -0400 Subject: [PATCH] [cr149][Android] Changes for optional/adaptive code in new build target Chromium changes: https://chromium.googlesource.com/chromium/src/+/eb9d7815cb653e948dda93f5f7e6df48080ab8ac commit eb9d7815cb653e948dda93f5f7e6df48080ab8ac Author: Calder Kitagawa Date: Tue Apr 21 10:28:47 2026 -0700 [IA] Move optional/adaptive code to new build target When moved to LocationBar this will create a cyclic dependency between omnibox and toolbar. Break this by moving the optional/adaptive button code to a separate build target. Bug: 491511644 Change-Id: I4531d28de4507d5590f0ba447e6b66cc2a9766a0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7771432 Auto-Submit: Calder Kitagawa Reviewed-by: Theresa Wellington Reviewed-by: Sky Malice Commit-Queue: Theresa Wellington Cr-Commit-Position: refs/heads/main@{#1618292} --- browser/ui/android/toolbar/BUILD.gn | 3 ++- build/android/bytecode/bytecode_rewriter.gni | 1 + test/BUILD.gn | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/ui/android/toolbar/BUILD.gn b/browser/ui/android/toolbar/BUILD.gn index 0eae7d62602..65d7c010f2b 100644 --- a/browser/ui/android/toolbar/BUILD.gn +++ b/browser/ui/android/toolbar/BUILD.gn @@ -22,7 +22,8 @@ android_library("java") { "//chrome/browser/android/lifecycle:java", "//chrome/browser/flags:java", "//chrome/browser/profiles/android:java", - "//chrome/browser/ui/android/toolbar:java", + "//chrome/browser/ui/android/toolbar:core_java", + "//chrome/browser/ui/android/toolbar:optional_button_java", "//ui/android:ui_no_recycler_view_java", "//url:url_java", ] diff --git a/build/android/bytecode/bytecode_rewriter.gni b/build/android/bytecode/bytecode_rewriter.gni index efe3913a893..7801c4dd07e 100644 --- a/build/android/bytecode/bytecode_rewriter.gni +++ b/build/android/bytecode/bytecode_rewriter.gni @@ -55,6 +55,7 @@ brave_bytecode_jars = [ "obj/chrome/browser/ui/android/theme/java.javac.jar", "obj/chrome/browser/ui/android/toolbar/core_java.javac.jar", "obj/chrome/browser/ui/android/toolbar/java.javac.jar", + "obj/chrome/browser/ui/android/toolbar/optional_button_java.javac.jar", "obj/chrome/browser/ui/messages/android/java.javac.jar", "obj/components/browser_ui/notifications/android/java.javac.jar", "obj/components/browser_ui/media/android/java.javac.jar", diff --git a/test/BUILD.gn b/test/BUILD.gn index d3924fc3adc..e1cbb101ee2 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1597,6 +1597,7 @@ if (is_android) { "//chrome/browser/ui/android/signin:java", "//chrome/browser/ui/android/theme:java", "//chrome/browser/ui/android/toolbar:java", + "//chrome/browser/ui/android/toolbar:optional_button_java", "//chrome/browser/ui/messages/android:java", "//chrome/browser/user_education:java", "//chrome/test:test_support_java",