mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-23 22:06:12 +03:00
Code Issues Projects Releases Wiki Activity

prefs: Disable Android JNI

Browse Source
This commit is contained in:
klzgrad 2022-05-04 14:58:47 +08:00
parent c4e6fbf2a2
commit 17031b73a5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/prefs/BUILD.gn
View File

@ -58,7 +58,7 @@ component("prefs") {
public_deps = [ "//base" ] public_deps = [ "//base" ]
if (is_android) { if (false) {
sources += [ sources += [
"android/pref_service_android.cc", "android/pref_service_android.cc",
"android/pref_service_android.h", "android/pref_service_android.h",

4
src/components/prefs/pref_service.cc
View File

@ -33,7 +33,7 @@
#include "components/prefs/value_map_pref_store.h" #include "components/prefs/value_map_pref_store.h"
#endif #endif
#if BUILDFLAG(IS_ANDROID) #if 0
#include "components/prefs/android/pref_service_android.h" #include "components/prefs/android/pref_service_android.h"
#endif #endif
@ -518,7 +518,7 @@ void PrefService::RemovePrefObserverAllPrefs(PrefObserver* obs) {
pref_notifier_->RemovePrefObserverAllPrefs(obs); pref_notifier_->RemovePrefObserverAllPrefs(obs);
} }
#if BUILDFLAG(IS_ANDROID) #if 0
base::android::ScopedJavaLocalRef<jobject> PrefService::GetJavaObject() { base::android::ScopedJavaLocalRef<jobject> PrefService::GetJavaObject() {
if (!pref_service_android_) { if (!pref_service_android_) {
pref_service_android_ = std::make_unique<PrefServiceAndroid>(this); pref_service_android_ = std::make_unique<PrefServiceAndroid>(this);

8
src/components/prefs/pref_service.h
View File

@ -31,7 +31,7 @@
#include "components/prefs/pref_value_store.h" #include "components/prefs/pref_value_store.h"
#include "components/prefs/prefs_export.h" #include "components/prefs/prefs_export.h"
#if BUILDFLAG(IS_ANDROID) #if 0
#include "base/android/scoped_java_ref.h" #include "base/android/scoped_java_ref.h"
#endif #endif
@ -40,7 +40,7 @@ class PrefNotifierImpl;
class PrefObserver; class PrefObserver;
class PrefRegistry; class PrefRegistry;
class PrefStore; class PrefStore;
#if BUILDFLAG(IS_ANDROID) #if 0
class PrefServiceAndroid; class PrefServiceAndroid;
#endif #endif
@ -404,7 +404,7 @@ class COMPONENTS_PREFS_EXPORT PrefService {
void RemoveStandaloneBrowserPref(const std::string& path); void RemoveStandaloneBrowserPref(const std::string& path);
#endif #endif
#if BUILDFLAG(IS_ANDROID) #if 0
base::android::ScopedJavaLocalRef<jobject> GetJavaObject(); base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
#endif #endif
@ -525,7 +525,7 @@ class COMPONENTS_PREFS_EXPORT PrefService {
// of registered preferences are. // of registered preferences are.
mutable PreferenceMap prefs_map_; mutable PreferenceMap prefs_map_;
#if BUILDFLAG(IS_ANDROID) #if 0
// Manage and fetch the java object that wraps this PrefService on // Manage and fetch the java object that wraps this PrefService on
// android. // android.
std::unique_ptr<PrefServiceAndroid> pref_service_android_; std::unique_ptr<PrefServiceAndroid> pref_service_android_;