components/cronet/android/cronet_library_loader.cc - Issue 2215863002: Fix cronet build after JNI registration change.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/cronet/android/cronet_library_loader.cc

Issue 2215863002: Fix cronet build after JNI registration change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: components/cronet/android/cronet_library_loader.cc

diff --git a/components/cronet/android/cronet_library_loader.cc b/components/cronet/android/cronet_library_loader.cc

index 6fd2e914226c1c7179abb2989fb873cdcb0472c5..55929ef775d2337215321a3d62825fc7e6a73442 100644

--- a/components/cronet/android/cronet_library_loader.cc

+++ b/components/cronet/android/cronet_library_loader.cc

@@ -32,9 +32,7 @@

#include "url/url_features.h"

#include "url/url_util.h"

-#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)

-#include "url/android/url_jni_registrar.h" // nogncheck

-#else

+#if !BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)

#include "base/i18n/icu_util.h" // nogncheck

#endif

@@ -53,9 +51,6 @@ const base::android::RegistrationMethod kCronetRegisteredMethods[] = {

{"CronetUrlRequestContextAdapter",

CronetUrlRequestContextAdapterRegisterJni},

{"NetAndroid", net::android::RegisterJni},

-#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)

- {"UrlAndroid", url::android::RegisterJni},

-#endif

};

// MessageLoop on the main thread, which is where objects that receive Java

« no previous file with comments | « no previous file | net/BUILD.gn » ('j') | no next file with comments »