commit 725be0c7ffc5a4a4e72326dfd93201f422d9df96
author Yi Kong <yikong@google.com> Tue Aug 09 13:36:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 13:36:59 2016 +0000
tree b9b4aeb5b649e69c00a35048acafd593d32f6834
parent 6478a0456f1253d037d4642844bb2029c89b4aa5
parent 72d823a386f1a9949f98cdd1d72f647e8a90adb3

Merge "Track libcore change 162bf4d3d62da1e581e7a40e01f5ad664f0507ef" am: aeec0e06c9
am: 72d823a386

Change-Id: I8c139c92cf11bbdf1ffac2aa7f5204b0513bf6f5

JniConstants.cpp

diff --git a/JniConstants.cpp b/JniConstants.cpp
index 87cb284..cfea131 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -57,6 +57,7 @@
 jclass JniConstants::structFlockClass;
 jclass JniConstants::structGroupReqClass;
 jclass JniConstants::structGroupSourceReqClass;
+jclass JniConstants::structIfaddrs;
 jclass JniConstants::structLingerClass;
 jclass JniConstants::structPasswdClass;
 jclass JniConstants::structPollfdClass;
@@ -121,6 +122,7 @@
     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");
     structPollfdClass = findClass(env, "android/system/StructPollfd");

include/nativehelper/JniConstants.h

diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index 82efa0d..a4ce4fc 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -68,6 +68,7 @@
     static jclass structFlockClass;
     static jclass structGroupReqClass;
     static jclass structGroupSourceReqClass;
+    static jclass structIfaddrs;
     static jclass structLingerClass;
     static jclass structPasswdClass;
     static jclass structPollfdClass;