Manually merge JniConstants changes from 81fd7cc0.
(cherry picked from commit 40f73e04d8c37b456224908ad7b57210cba933c2)
Change-Id: I34de4bafbe648a7f3c467028c887c418402c7917
diff --git a/JniConstants.cpp b/JniConstants.cpp
index 7ffcbb2..6c3b9aa 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -39,6 +39,7 @@
jclass JniConstants::inet6AddressClass;
jclass JniConstants::inetAddressClass;
jclass JniConstants::inetSocketAddressClass;
+jclass JniConstants::inetUnixAddressClass;
jclass JniConstants::inflaterClass;
jclass JniConstants::inputStreamClass;
jclass JniConstants::integerClass;
@@ -66,6 +67,7 @@
jclass JniConstants::structStatClass;
jclass JniConstants::structStatFsClass;
jclass JniConstants::structTimevalClass;
+jclass JniConstants::structUcredClass;
jclass JniConstants::structUtsnameClass;
static jclass findClass(JNIEnv* env, const char* name) {
@@ -99,6 +101,7 @@
inet6AddressClass = findClass(env, "java/net/Inet6Address");
inetAddressClass = findClass(env, "java/net/InetAddress");
inetSocketAddressClass = findClass(env, "java/net/InetSocketAddress");
+ inetUnixAddressClass = findClass(env, "java/net/InetUnixAddress");
inflaterClass = findClass(env, "java/util/zip/Inflater");
inputStreamClass = findClass(env, "java/io/InputStream");
integerClass = findClass(env, "java/lang/Integer");
@@ -126,5 +129,6 @@
structStatClass = findClass(env, "libcore/io/StructStat");
structStatFsClass = findClass(env, "libcore/io/StructStatFs");
structTimevalClass = findClass(env, "libcore/io/StructTimeval");
+ structUcredClass = findClass(env, "libcore/io/StructUcred");
structUtsnameClass = findClass(env, "libcore/io/StructUtsname");
}
diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index 117dec5..f11ec9c 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -60,6 +60,7 @@
static jclass inet6AddressClass;
static jclass inetAddressClass;
static jclass inetSocketAddressClass;
+ static jclass inetUnixAddressClass;
static jclass inflaterClass;
static jclass inputStreamClass;
static jclass integerClass;
@@ -87,6 +88,7 @@
static jclass structStatClass;
static jclass structStatFsClass;
static jclass structTimevalClass;
+ static jclass structUcredClass;
static jclass structUtsnameClass;
};