Merge pull request #14554 from brave/android_mono_build_fix

[Android] Fix for mono build linker error

android/brave_java_sources.gni

@@ -16,6 +16,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/BraveAppHooks.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveApplicationImplBase.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveBadge.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveHelper.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveIntentHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveLaunchIntentDispatcher.java",

android/java/org/chromium/base/BraveFeatureList.java

@@ -5,10 +5,6 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
-
-@JNINamespace("chrome::android")
 public abstract class BraveFeatureList {
     public static final String BRAVE_REWARDS = "BraveRewards";
     public static final String NATIVE_BRAVE_WALLET = "NativeBraveWallet";
@@ -20,14 +16,4 @@ public abstract class BraveFeatureList {
     public static final String ENABLE_TAB_GRID = "enable-tab-grid-layout";
     public static final String BRAVE_WALLET_SOLANA = "BraveWalletSolana";
     public static final String BRAVE_SEARCH_OMNIBOX_BANNER = "BraveSearchOmniboxBanner";
-
-    public static void enableFeature(
-            String featureName, boolean enabled, boolean fallbackToDefault) {
-        BraveFeatureListJni.get().enableFeature(featureName, enabled, fallbackToDefault);
-    }
-
-    @NativeMethods
-    interface Natives {
-        void enableFeature(String featureName, boolean enabled, boolean fallbackToDefault);
-    }
 }

android/java/org/chromium/chrome/browser/BraveFeatureUtil.java

@@ -0,0 +1,22 @@
+/* Copyright (c) 2022 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 http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser;
+
+import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
+
+@JNINamespace("chrome::android")
+public abstract class BraveFeatureUtil {
+    public static void enableFeature(
+            String featureName, boolean enabled, boolean fallbackToDefault) {
+        BraveFeatureUtilJni.get().enableFeature(featureName, enabled, fallbackToDefault);
+    }
+
+    @NativeMethods
+    interface Natives {
+        void enableFeature(String featureName, boolean enabled, boolean fallbackToDefault);
+    }
+}

android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java

@@ -15,6 +15,7 @@ import androidx.preference.Preference;
 import org.chromium.base.BraveFeatureList;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.BraveFeatureUtil;
 import org.chromium.chrome.browser.BraveRelaunchUtils;
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
 import org.chromium.chrome.browser.BraveRewardsObserver;
@@ -161,7 +162,7 @@ public class AppearancePreferences extends BravePreferenceFragment
             sharedPreferencesEditor.apply();
             BraveRelaunchUtils.askForRelaunch(getActivity());
         } else if (PREF_BRAVE_NIGHT_MODE_ENABLED.equals(key)) {
-            BraveFeatureList.enableFeature(
+            BraveFeatureUtil.enableFeature(
                     BraveFeatureList.ENABLE_FORCE_DARK, (boolean) newValue, true);
             BraveRelaunchUtils.askForRelaunch(getActivity());
         } else if (PREF_BRAVE_DISABLE_SHARING_HUB.equals(key)) {

browser/android/BUILD.gn

@@ -6,7 +6,7 @@ source_set("android_browser_process") {
 
   sources = [
     "//brave/browser/brave_ads/android/brave_ads_native_helper.cc",
-    "brave_feature_list.cc",
+    "brave_feature_util.cc",
     "brave_relaunch_utils.cc",
     "brave_shields_content_settings.cc",
     "brave_shields_content_settings.h",

browser/android/brave_feature_util.cc

@@ -7,7 +7,7 @@
 
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
-#include "brave/build/android/jni_headers/BraveFeatureList_jni.h"
+#include "brave/build/android/jni_headers/BraveFeatureUtil_jni.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "components/flags_ui/feature_entry.h"
@@ -31,7 +31,7 @@ int GetNumberOfOptions(const std::string& internal_name) {
   return entry->NumOptions();
 }
 
-static void JNI_BraveFeatureList_EnableFeature(
+static void JNI_BraveFeatureUtil_EnableFeature(
     JNIEnv* env,
     const base::android::JavaParamRef<jstring>& featureName,
     jboolean enabled,

build/android/BUILD.gn

@@ -176,7 +176,7 @@ brave_xml_preprocessor("brave_java_xml_preprocess_resources") {
 
 generate_jni("jni_headers") {
   sources = [
-    "//brave/android/java/org/chromium/base/BraveFeatureList.java",
+    "//brave/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java",
     "//brave/android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java",
     "//brave/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java",
     "//brave/android/java/org/chromium/chrome/browser/BraveSyncWorker.java",