commit 33368eb944482d35f31beaa9f5afab94a95d1628
author Andreas Gampe <agampe@google.com> Tue Oct 31 16:01:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 16:01:23 2017 +0000
tree f4a2bd41d79bb47929b0e20256045464e30ad754
parent a81928467025eb5624fa4bd97ff739af104ccfef
parent 5fa5a563557d94d5129e0ccdeaa9e7abc9f9a944

Merge "Libnativehelper: Move mutable class cache to libcore" am: 00673ebddc am: 4bff247bc2
am: 5fa5a56355

Change-Id: Iedcfacf069f8f84adcc2b33ec7be9bd2f60cbb15

JniConstants.cpp

diff --git a/JniConstants.cpp b/JniConstants.cpp
index d96cfea..7343678 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -47,8 +47,6 @@
 jclass JniConstants::integerClass;
 jclass JniConstants::localeDataClass;
 jclass JniConstants::longClass;
-jclass JniConstants::mutableIntClass;
-jclass JniConstants::mutableLongClass;
 jclass JniConstants::netlinkSocketAddressClass;
 jclass JniConstants::packetSocketAddressClass;
 jclass JniConstants::patternSyntaxExceptionClass;
@@ -112,8 +110,6 @@
     integerClass = findClass(env, "java/lang/Integer");
     localeDataClass = findClass(env, "libcore/icu/LocaleData");
     longClass = findClass(env, "java/lang/Long");
-    mutableIntClass = findClass(env, "libcore/util/MutableInt");
-    mutableLongClass = findClass(env, "libcore/util/MutableLong");
     netlinkSocketAddressClass = findClass(env, "android/system/NetlinkSocketAddress");
     packetSocketAddressClass = findClass(env, "android/system/PacketSocketAddress");
     patternSyntaxExceptionClass = findClass(env, "java/util/regex/PatternSyntaxException");

include/nativehelper/JniConstants.h

diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index 897d399..a3d917f 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -56,8 +56,6 @@
     static jclass integerClass;
     static jclass localeDataClass;
     static jclass longClass;
-    static jclass mutableIntClass;
-    static jclass mutableLongClass;
     static jclass netlinkSocketAddressClass;
     static jclass packetSocketAddressClass;
     static jclass patternSyntaxExceptionClass;