commit 0d73c15fb775096f4bc9e99e7d5c983c679c2c11
author vichang <vichang@google.com> Thu Sep 21 12:42:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 21 12:42:15 2017 +0000
tree e19bc769afdd985d5134e6b84a12ef0418ae0e69
parent 7afb45427eea5db9df4ad0f7f3622de0530f84f2
parent 9b496b4495f8292a886aac96ea4b142d2b7b0fa4

Merge "Remove setsockoptGroupSourceReq and StructGroupSourceReq"

JniConstants.cpp

diff --git a/JniConstants.cpp b/JniConstants.cpp
index 632e40c..3ac554b 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -58,7 +58,6 @@
 jclass JniConstants::structAddrinfoClass;
 jclass JniConstants::structFlockClass;
 jclass JniConstants::structGroupReqClass;
-jclass JniConstants::structGroupSourceReqClass;
 jclass JniConstants::structIfaddrs;
 jclass JniConstants::structLingerClass;
 jclass JniConstants::structPasswdClass;
@@ -124,7 +123,6 @@
     structAddrinfoClass = findClass(env, "android/system/StructAddrinfo");
     structFlockClass = findClass(env, "android/system/StructFlock");
     structGroupReqClass = findClass(env, "android/system/StructGroupReq");
-    structGroupSourceReqClass = findClass(env, "android/system/StructGroupSourceReq");
     structIfaddrs = findClass(env, "android/system/StructIfaddrs");
     structLingerClass = findClass(env, "android/system/StructLinger");
     structPasswdClass = findClass(env, "android/system/StructPasswd");

include/nativehelper/JniConstants.h

diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index 266fccd..897d399 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -67,7 +67,6 @@
     static jclass structAddrinfoClass;
     static jclass structFlockClass;
     static jclass structGroupReqClass;
-    static jclass structGroupSourceReqClass;
     static jclass structIfaddrs;
     static jclass structLingerClass;
     static jclass structPasswdClass;