commit 480262f535de2d7ca4520f53f2a30fa43a680922
author vichang <vichang@google.com> Thu Sep 21 12:54:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 12:54:00 2017 +0000
tree e19bc769afdd985d5134e6b84a12ef0418ae0e69
parent 2f1df339124b3337f0dff1204c72436816e85c32
parent fae9e5c68f6879291114910ac94dcd2abdfc35a4

Merge "Remove setsockoptGroupSourceReq and StructGroupSourceReq" am: 0d73c15fb7
am: fae9e5c68f

Change-Id: I8828fd0a11dd7414d004d9652cc8a38d0eee84a6

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;