Reverts to track dalvik and libcore
Revert "Tracking removal of Method.NO_ANNOTATIONS static field from libcore"
This reverts commit c6766ed17d27417bfce62c31b342b3faa47ada5d.
Revert "Implement Class.getDex."
This reverts commit 98fb41647a5664922a196fd1f6b343e6bad8e51e
Revert "Track libcore change."
This revert commit c3d530c371d5c915f4d4545810d77d391dbbfec9
Change-Id: I7159af63f100fc9810e6c2e5ef18b0c4942acc8b
diff --git a/src/dex_file.cc b/src/dex_file.cc
index b47be1f..924953f 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -386,44 +386,7 @@
}
}
-DexFile::~DexFile() {
- if (dex_object_ != NULL) {
- UNIMPLEMENTED(WARNING) << "leaked a global reference to an com.android.dex.Dex instance";
- }
-}
-
-jobject DexFile::GetDexObject(JNIEnv* env) const {
- MutexLock mu(dex_object_lock_);
- if (dex_object_ != NULL) {
- return dex_object_;
- }
-
- void* address = const_cast<void*>(reinterpret_cast<const void*>(base_));
- jobject byte_buffer = env->NewDirectByteBuffer(address, length_);
- if (byte_buffer == NULL) {
- return NULL;
- }
-
- jclass c = env->FindClass("com/android/dex/Dex");
- if (c == NULL) {
- return NULL;
- }
-
- jmethodID mid = env->GetStaticMethodID(c, "create", "(Ljava/nio/ByteBuffer;)Lcom/android/dex/Dex;");
- if (mid == NULL) {
- return NULL;
- }
-
- jvalue args[1];
- args[0].l = byte_buffer;
- jobject local = env->CallStaticObjectMethodA(c, mid, args);
- if (local == NULL) {
- return NULL;
- }
-
- dex_object_ = env->NewGlobalRef(local);
- return dex_object_;
-}
+DexFile::~DexFile() {}
bool DexFile::Init() {
InitMembers();