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/java_lang_Class.cc b/src/java_lang_Class.cc
index 32941be..9ca171b 100644
--- a/src/java_lang_Class.cc
+++ b/src/java_lang_Class.cc
@@ -57,17 +57,6 @@
return JNI_FALSE;
}
-jobject Class_getDex(JNIEnv* env, jobject javaClass) {
- Class* c = Decode<Class*>(env, javaClass);
-
- DexCache* dex_cache = c->GetDexCache();
- if (dex_cache == NULL) {
- return NULL;
- }
-
- return Runtime::Current()->GetClassLinker()->FindDexFile(dex_cache).GetDexObject(env);
-}
-
jobject Class_getClassLoader(JNIEnv* env, jclass, jobject javaClass) {
Class* c = Decode<Class*>(env, javaClass);
Object* result = reinterpret_cast<Object*>(const_cast<ClassLoader*>(c->GetClassLoader()));
@@ -156,6 +145,16 @@
return NULL;
}
+jobject Class_getEnclosingConstructor(JNIEnv* env, jobject javaThis) {
+ UNIMPLEMENTED(WARNING) << "needs annotations";
+ return NULL;
+}
+
+jobject Class_getEnclosingMethod(JNIEnv* env, jobject javaThis) {
+ UNIMPLEMENTED(WARNING) << "needs annotations";
+ return NULL;
+}
+
/*
* private native String getNameNative()
*
@@ -323,7 +322,9 @@
//NATIVE_METHOD(Class, getDeclaredFields, "(Ljava/lang/Class;Z)[Ljava/lang/reflect/Field;"),
//NATIVE_METHOD(Class, getDeclaredMethods, "(Ljava/lang/Class;Z)[Ljava/lang/reflect/Method;"),
NATIVE_METHOD(Class, getDeclaringClass, "()Ljava/lang/Class;"),
- NATIVE_METHOD(Class, getDex, "()Lcom/android/dex/Dex;"),
+ //NATIVE_METHOD(Class, getEnclosingClass, "()Ljava/lang/Class;"),
+ NATIVE_METHOD(Class, getEnclosingConstructor, "()Ljava/lang/reflect/Constructor;"),
+ NATIVE_METHOD(Class, getEnclosingMethod, "()Ljava/lang/reflect/Method;"),
//NATIVE_METHOD(Class, getInnerClassName, "()Ljava/lang/String;"),
//NATIVE_METHOD(Class, getInterfaces, "()[Ljava/lang/Class;"),
//NATIVE_METHOD(Class, getModifiers, "(Ljava/lang/Class;Z)I"),