Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Unified Diff: url/android/url_jni_registrar.cc

Issue 1839803002: Remove net & url small, iOS ICU alternatives, unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « url/BUILD.gn ('k') | url/features.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/android/url_jni_registrar.cc
diff --git a/url/android/url_jni_registrar.cc b/url/android/url_jni_registrar.cc
index 82a6e1b76bd699624c8b7296382668c4cc46abaa..f594d2451fe41aedf16dd87559969ce8fd0fca37 100644
--- a/url/android/url_jni_registrar.cc
+++ b/url/android/url_jni_registrar.cc
@@ -3,8 +3,9 @@
// found in the LICENSE file.
#include "url/android/url_jni_registrar.h"
+#include "url/url_features.h"
-#ifdef USE_ICU_ALTERNATIVES_ON_ANDROID
+#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
#include "url/url_canon_icu_alternatives_android.h"
#endif
@@ -12,11 +13,11 @@ namespace url {
namespace android {
bool RegisterJni(JNIEnv* env) {
-#ifdef USE_ICU_ALTERNATIVES_ON_ANDROID
+#if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
return RegisterIcuAlternativesJni(env);
#endif
- // Do nothing if USE_ICU_ALTERNATIVES_ON_ANDROID is not defined.
+ // Do nothing if USE_PLATFORM_ICU_ALTERNATIVES is false.
return true;
}
« no previous file with comments | « url/BUILD.gn ('k') | url/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698