commit 75a34a61567932607a62ab0b802b6aff1e9c8d60
author Lorenzo Colitti <lorenzo@google.com> Mon Feb 15 17:07:57 2021 +0900
committer Lorenzo Colitti <lorenzo@google.com> Mon Feb 15 12:05:40 2021 +0000
tree 14cf775a5b51e6766a5f9ea6c84364ca4941a491
parent 5b2c952f32613cb454684e15252059f6bee18d4d

Move the VPN code out of packages/Connectivity.

Bug: 173331190
Test: atest FrameworksNetTests HostsideVpnTests CtsNetTestCases
Change-Id: Idc6ed1a544e744f8661d1e387da278736d407489

service/jni/onload.cpp

diff --git a/service/jni/onload.cpp b/service/jni/onload.cpp
index 3afcb0e..0012879 100644
--- a/service/jni/onload.cpp
+++ b/service/jni/onload.cpp
@@ -19,7 +19,6 @@
 
 namespace android {
 
-int register_android_server_connectivity_Vpn(JNIEnv* env);
 int register_android_server_TestNetworkService(JNIEnv* env);
 
 extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
@@ -29,12 +28,11 @@
         return JNI_ERR;
     }
 
-    if (register_android_server_connectivity_Vpn(env) < 0
-        || register_android_server_TestNetworkService(env) < 0) {
+    if (register_android_server_TestNetworkService(env) < 0) {
         return JNI_ERR;
     }
 
     return JNI_VERSION_1_6;
 }
 
-};
\ No newline at end of file
+};