Artem Samoilenko
1d33bdf24c
Chromium changes: https://chromium.googlesource.com/chromium/src/+/eb9d7815cb653e948dda93f5f7e6df48080ab8ac commit eb9d7815cb653e948dda93f5f7e6df48080ab8ac Author: Calder Kitagawa <ckitagawa@chromium.org> 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 <ckitagawa@chromium.org> Reviewed-by: Theresa Wellington <twellington@chromium.org> Reviewed-by: Sky Malice <skym@chromium.org> Commit-Queue: Theresa Wellington <twellington@chromium.org> Cr-Commit-Position: refs/heads/main@{#1618292}
104 lines
5.0 KiB
Plaintext
104 lines
5.0 KiB
Plaintext
# Copyright (c) 2020 The Brave Authors. All rights reserved.
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
# You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
import("//build/config/python.gni")
|
|
|
|
brave_bytecode_jars = [
|
|
"obj/base/base_cached_flags_java.javac.jar",
|
|
"obj/base/base_shared_preferences_java.javac.jar",
|
|
"obj/brave/android/features/tab_ui/java.javac.jar",
|
|
"obj/brave/browser/autofill/android/java.javac.jar",
|
|
"obj/brave/android/java/org/chromium/chrome/browser/search_engines/java.javac.jar",
|
|
"obj/brave/browser/download/android/java.javac.jar",
|
|
"obj/brave/browser/notifications/java.javac.jar",
|
|
"obj/brave/browser/ui/android/favicon/java.javac.jar",
|
|
"obj/brave/browser/ui/android/logo/java.javac.jar",
|
|
"obj/brave/browser/ui/android/omnibox/java.javac.jar",
|
|
"obj/brave/browser/ui/android/theme/java.javac.jar",
|
|
"obj/brave/browser/ui/android/toolbar/java.javac.jar",
|
|
"obj/brave/components/browser_ui/notifications/android/java.javac.jar",
|
|
"obj/brave/components/browser_ui/media/android/java.javac.jar",
|
|
"obj/brave/components/browser_ui/site_settings/android/java.javac.jar",
|
|
"obj/brave/components/variations/android/java.javac.jar",
|
|
"obj/chrome/browser/autofill/android/java.javac.jar",
|
|
"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/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",
|
|
"obj/chrome/browser/hub/factory_java.javac.jar",
|
|
"obj/chrome/browser/incognito/java.javac.jar",
|
|
"obj/chrome/browser/locale/delegate_java.javac.jar",
|
|
"obj/chrome/browser/notifications/java.javac.jar",
|
|
"obj/chrome/browser/partnercustomizations/java.javac.jar",
|
|
"obj/chrome/browser/password_manager/android/java.javac.jar",
|
|
"obj/chrome/browser/preferences/java.javac.jar",
|
|
"obj/chrome/browser/safe_browsing/android/java.javac.jar",
|
|
"obj/chrome/browser/safety_hub/android/java.javac.jar",
|
|
"obj/chrome/browser/search_engines/android/java.javac.jar",
|
|
"obj/chrome/browser/settings/factory_java.javac.jar",
|
|
"obj/chrome/browser/settings/internal_java.javac.jar",
|
|
"obj/chrome/browser/site_settings/android/java.javac.jar",
|
|
"obj/chrome/browser/tabmodel/java.javac.jar",
|
|
"obj/chrome/browser/customtabs/java.javac.jar",
|
|
"obj/chrome/browser/tab_group_sync/java.javac.jar",
|
|
"obj/chrome/browser/tab_ui/android/java.javac.jar",
|
|
"obj/chrome/browser/ui/android/appmenu/internal/java.javac.jar",
|
|
"obj/chrome/browser/ui/android/logo/java.javac.jar",
|
|
"obj/chrome/browser/ui/android/omnibox/java.javac.jar",
|
|
"obj/chrome/browser/ui/android/searchactivityutils/java.javac.jar",
|
|
"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",
|
|
"obj/components/browser_ui/site_settings/android/java.javac.jar",
|
|
"obj/components/embedder_support/android/content_view_java.javac.jar",
|
|
"obj/components/external_intents/android/java.javac.jar",
|
|
"obj/components/minidump_uploader/minidump_uploader_java.javac.jar",
|
|
"obj/components/permissions/android/java.javac.jar",
|
|
"obj/components/signin/public/android/java.javac.jar",
|
|
"obj/components/sync/android/sync_java.javac.jar",
|
|
"obj/components/variations/android/variations_java.javac.jar",
|
|
"obj/chrome/browser/language/android/base_module_java.javac.jar",
|
|
]
|
|
|
|
template("brave_bytecode_rewriter") {
|
|
_rebased_build_config = rebase_path(invoker.build_config, root_build_dir)
|
|
_java_bytecode_rewriter_input_jar = invoker._unprocessed_jar_path
|
|
|
|
action_with_pydeps(target_name) {
|
|
script = "//brave/build/android/gyp/bytecode_processor.py"
|
|
_bytecode_rewriter_script =
|
|
"$root_build_dir/bin/helper/java_bytecode_rewriter"
|
|
deps = invoker._unprocessed_jar_deps + [ "//brave/build/android/bytecode:java_bytecode_rewriter($default_toolchain)" ]
|
|
if (defined(invoker.deps)) {
|
|
deps += invoker.deps
|
|
}
|
|
inputs = [
|
|
_bytecode_rewriter_script,
|
|
_java_bytecode_rewriter_input_jar,
|
|
]
|
|
outputs = [ invoker._bytecode_rewriter_output_jar ]
|
|
args = [
|
|
"--script",
|
|
rebase_path(_bytecode_rewriter_script, root_build_dir),
|
|
"--input-jar",
|
|
rebase_path(_java_bytecode_rewriter_input_jar, root_build_dir),
|
|
"--output-jar",
|
|
rebase_path(invoker._bytecode_rewriter_output_jar, root_build_dir),
|
|
"--sdk-classpath-jars",
|
|
"@FileArg($_rebased_build_config:sdk_jars)",
|
|
"--extra-classpath-jars",
|
|
"@FileArg($_rebased_build_config:javac_full_classpath)",
|
|
]
|
|
}
|
|
}
|