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

Unified Diff: net/test/run_all_unittests.cc

Issue 1373103002: Unbreak gn build of net_unittests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « components/cronet/android/cronet_library_loader.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/run_all_unittests.cc
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index 7da799183dc29779b58f6d287b86e6726bec4c57..535fa07a0b451228e62e1cf75ae60d09e31c6ca5 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -18,6 +18,9 @@
#include "base/test/test_ui_thread_android.h"
#include "net/android/dummy_spnego_authenticator.h"
#include "net/android/net_jni_registrar.h"
+#endif
+
+#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
#include "url/android/url_jni_registrar.h"
#endif
@@ -34,12 +37,14 @@ int main(int argc, char** argv) {
#if defined(OS_ANDROID)
const base::android::RegistrationMethod kNetTestRegisteredMethods[] = {
- {"DummySpnegoAuthenticator",
- net::android::DummySpnegoAuthenticator::RegisterJni},
- {"NetAndroid", net::android::RegisterJni},
- {"TestFileUtil", base::RegisterContentUriTestUtils},
- {"TestUiThreadAndroid", base::RegisterTestUiThreadAndroid},
- {"UrlAndroid", url::android::RegisterJni},
+ {"DummySpnegoAuthenticator",
+ net::android::DummySpnegoAuthenticator::RegisterJni},
+ {"NetAndroid", net::android::RegisterJni},
+ {"TestFileUtil", base::RegisterContentUriTestUtils},
+ {"TestUiThreadAndroid", base::RegisterTestUiThreadAndroid},
+#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+ {"UrlAndroid", url::android::RegisterJni},
+#endif
};
// Register JNI bindings for android. Doing it early as the test suite setup
« no previous file with comments | « components/cronet/android/cronet_library_loader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698