diff --git a/chromium_src/components/permissions/android/permission_dialog_delegate.cc b/chromium_src/components/permissions/android/permission_dialog_delegate.cc
index c589e5b3260..7c8e13504eb 100644
--- a/chromium_src/components/permissions/android/permission_dialog_delegate.cc
+++ b/chromium_src/components/permissions/android/permission_dialog_delegate.cc
@@ -7,9 +7,9 @@
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "brave/components/permissions/android/jni_headers/BravePermissionDialogDelegate_jni.h"
 #include "brave/components/permissions/permission_lifetime_utils.h"
 #include "components/grit/brave_components_strings.h"
-#include "components/permissions/android/jni_headers/BravePermissionDialogDelegate_jni.h"
 #include "components/permissions/android/jni_headers/PermissionDialogController_jni.h"
 #include "components/permissions/features.h"
 #include "components/strings/grit/components_strings.h"
diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn
new file mode 100644
index 00000000000..7e72eff82e8
--- /dev/null
+++ b/components/permissions/android/BUILD.gn
@@ -0,0 +1,5 @@
+import("//build/config/android/rules.gni")
+
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/components/permissions/BravePermissionDialogDelegate.java" ]
+}
diff --git a/components/permissions/android/java_sources.gni b/components/permissions/android/java_sources.gni
index c3929383c8e..7aa29a97348 100644
--- a/components/permissions/android/java_sources.gni
+++ b/components/permissions/android/java_sources.gni
@@ -1,5 +1,3 @@
-brave_components_permissions_java_jni_sources = [ "//brave/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogDelegate.java" ]
-
 brave_components_permissions_java_sources = [
   "//brave/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogDelegate.java",
   "//brave/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogModel.java",
diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch
index 57af5240800..45f017058d7 100644
--- a/patches/components-permissions-BUILD.gn.patch
+++ b/patches/components-permissions-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
-index 799755985b575a7464897d0969bf383c386d267c..84620efdf6cfc864cc6942272965b42382685c61 100644
+index 799755985b575a7464897d0969bf383c386d267c..5d024c0b16026a644902ec22cc129b9b930df62d 100644
 --- a/components/permissions/BUILD.gn
 +++ b/components/permissions/BUILD.gn
 @@ -89,6 +89,7 @@ source_set("permissions") {
      "//ui/base",
      "//url",
    ]
-+  import("//brave/components/permissions/sources.gni") sources += brave_components_permissions_sources deps += brave_components_permissions_deps
++  import("//brave/components/permissions/sources.gni") sources += brave_components_permissions_sources deps += brave_components_permissions_deps if (is_android) { deps += [ "//brave/components/permissions/android:jni_headers" ] }
    if (is_android) {
      sources += [
        "android/android_permission_util.cc",
diff --git a/patches/components-permissions-android-BUILD.gn.patch b/patches/components-permissions-android-BUILD.gn.patch
index 15f7ddeb10c..97db0bc3c86 100644
--- a/patches/components-permissions-android-BUILD.gn.patch
+++ b/patches/components-permissions-android-BUILD.gn.patch
@@ -1,16 +1,8 @@
 diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn
-index 3cfa933430a16ea55bfae73aa02e195a0aedd5a9..79d9bfcd28fa8b1c490213cb34abd31943a64e88 100644
+index 3cfa933430a16ea55bfae73aa02e195a0aedd5a9..63c57d2a2d2eb1969beee00f4cc229405259d1c7 100644
 --- a/components/permissions/android/BUILD.gn
 +++ b/components/permissions/android/BUILD.gn
-@@ -14,6 +14,7 @@ generate_jni("jni_headers") {
-     "java/src/org/chromium/components/permissions/PermissionUtil.java",
-     "java/src/org/chromium/components/permissions/nfc/NfcSystemLevelSetting.java",
-   ]
-+  sources += brave_components_permissions_java_jni_sources
- }
- 
- android_resources("java_resources") {
-@@ -124,6 +125,7 @@ android_library("java") {
+@@ -124,6 +124,7 @@ android_library("java") {
      "java/src/org/chromium/components/permissions/nfc/NfcSystemLevelPrompt.java",
      "java/src/org/chromium/components/permissions/nfc/NfcSystemLevelSetting.java",
    ]