diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 7e2b152b1ae..4093d353e6c 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -388,7 +388,6 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/shields/CreateCustomFiltersFragment.java", "../../brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java", "../../brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java", - "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java", "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java", "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSites.java", "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java", diff --git a/browser/signin/services/android/BUILD.gn b/browser/signin/services/android/BUILD.gn new file mode 100644 index 00000000000..34ee658ef44 --- /dev/null +++ b/browser/signin/services/android/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright (c) 2026 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/android/rules.gni") +import("//third_party/jni_zero/jni_zero.gni") + +generate_jni("jni_headers") { + sources = [ "java/src/org/chromium/chrome/browser/signin/services/BraveSigninManager.java" ] +} + +android_library("java") { + sources = [ "java/src/org/chromium/chrome/browser/signin/services/BraveSigninManager.java" ] + deps = [ + "//base:base_java", + "//chrome/browser/signin/services/android:java", + "//components/prefs/android:java", + "//components/signin/public/android:java", + "//third_party/androidx:androidx_annotation_annotation_java", + "//third_party/androidx:androidx_appcompat_appcompat_resources_java", + "//third_party/jni_zero:jni_zero_java", + ] + srcjar_deps = [ ":jni_headers" ] +} diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/BraveSigninManager.java similarity index 97% rename from android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java rename to browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/BraveSigninManager.java index 46490467975..f4171178ee1 100644 --- a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java +++ b/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/BraveSigninManager.java @@ -3,7 +3,7 @@ * 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/. */ -package org.chromium.chrome.browser.signin; +package org.chromium.chrome.browser.signin.services; import androidx.annotation.MainThread; @@ -13,7 +13,6 @@ import org.jni_zero.JniType; import org.chromium.base.Callback; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; -import org.chromium.chrome.browser.signin.services.SigninManager; import org.chromium.components.prefs.PrefService; import org.chromium.components.signin.base.CoreAccountInfo; import org.chromium.components.signin.identitymanager.IdentityManager; diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn index 91946361b3d..5cb653cad19 100644 --- a/build/android/BUILD.gn +++ b/build/android/BUILD.gn @@ -229,7 +229,6 @@ generate_jni("jni_headers") { "//brave/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java", "//brave/android/java/org/chromium/chrome/browser/notifications/channels/BraveSiteChannelsManagerBridge.java", "//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java", - "//brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java", "//brave/android/java/org/chromium/chrome/browser/util/TabUtils.java", ] @@ -239,6 +238,7 @@ generate_jni("jni_headers") { public_deps = [ "//brave/android/java/org/chromium/chrome/browser/search_engines:jni_headers", + "//brave/browser/signin/services/android:jni_headers", "//chrome/android:chrome_jni_headers", ] } diff --git a/build/android/config.gni b/build/android/config.gni index 89bc6e90f33..dc6a1109769 100644 --- a/build/android/config.gni +++ b/build/android/config.gni @@ -37,6 +37,7 @@ brave_chrome_java_deps = [ "//brave/browser/password_entry_edit:public_java", "//brave/browser/quick_search_engines/android:java", "//brave/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings:java", + "//brave/browser/signin/services/android:java", "//brave/browser/skus/android:java", "//brave/browser/tab_group_sync:java", "//brave/browser/ui/android/favicon:java", diff --git a/chromium_src/chrome/browser/signin/android/signin_manager_android.cc b/chromium_src/chrome/browser/signin/android/signin_manager_android.cc index 192ca71e51b..90750268c3b 100644 --- a/chromium_src/chrome/browser/signin/android/signin_manager_android.cc +++ b/chromium_src/chrome/browser/signin/android/signin_manager_android.cc @@ -11,8 +11,8 @@ #include "components/signin/public/identity_manager/identity_manager.h" // Must come after all headers that specialize FromJniType() / ToJniType(). -#include "brave/build/android/jni_headers/BraveSigninManager_jni.h" -#include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h" +#include "brave/browser/signin/services/android/jni_headers/BraveSigninManager_jni.h" +#include "chrome/browser/signin/services/android/jni_headers/SigninManagerImpl_jni.h" namespace { // For preventing "unused Java_SigninManager_create method" compile error.