From 7940e44f4517de5e2634a7e07d58d0fb26160513 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Fri, 12 Jul 2013 13:46:57 -0700 Subject: Create separate Android.mk for main build targets The runtime, compiler, dex2oat, and oatdump now are in seperate trees to prevent dependency creep. They can now be individually built without rebuilding the rest of the art projects. dalvikvm and jdwpspy were already this way. Builds in the art directory should behave as before, building everything including tests. Change-Id: Ic6b1151e5ed0f823c3dd301afd2b13eb2d8feb81 --- src/native/java_lang_Class.cc | 135 ------------------------------------------ 1 file changed, 135 deletions(-) delete mode 100644 src/native/java_lang_Class.cc (limited to 'src/native/java_lang_Class.cc') diff --git a/src/native/java_lang_Class.cc b/src/native/java_lang_Class.cc deleted file mode 100644 index a7296996da..0000000000 --- a/src/native/java_lang_Class.cc +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "class_linker.h" -#include "dex_file-inl.h" -#include "jni_internal.h" -#include "nth_caller_visitor.h" -#include "mirror/class-inl.h" -#include "mirror/class_loader.h" -#include "mirror/object-inl.h" -#include "mirror/proxy.h" -#include "object_utils.h" -#include "scoped_thread_state_change.h" -#include "ScopedLocalRef.h" -#include "ScopedUtfChars.h" -#include "well_known_classes.h" - -namespace art { - -static mirror::Class* DecodeClass(const ScopedObjectAccess& soa, jobject java_class) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - mirror::Class* c = soa.Decode(java_class); - DCHECK(c != NULL); - DCHECK(c->IsClass()); - // TODO: we could EnsureInitialized here, rather than on every reflective get/set or invoke . - // For now, we conservatively preserve the old dalvik behavior. A quick "IsInitialized" check - // every time probably doesn't make much difference to reflection performance anyway. - return c; -} - -// "name" is in "binary name" format, e.g. "dalvik.system.Debug$1". -static jclass Class_classForName(JNIEnv* env, jclass, jstring javaName, jboolean initialize, jobject javaLoader) { - ScopedObjectAccess soa(env); - ScopedUtfChars name(env, javaName); - if (name.c_str() == NULL) { - return NULL; - } - - // We need to validate and convert the name (from x.y.z to x/y/z). This - // is especially handy for array types, since we want to avoid - // auto-generating bogus array classes. - if (!IsValidBinaryClassName(name.c_str())) { - ThrowLocation throw_location = soa.Self()->GetCurrentLocationForThrow(); - soa.Self()->ThrowNewExceptionF(throw_location, "Ljava/lang/ClassNotFoundException;", - "Invalid name: %s", name.c_str()); - return NULL; - } - - std::string descriptor(DotToDescriptor(name.c_str())); - mirror::ClassLoader* class_loader = soa.Decode(javaLoader); - ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); - mirror::Class* c = class_linker->FindClass(descriptor.c_str(), class_loader); - if (c == NULL) { - ScopedLocalRef cause(env, env->ExceptionOccurred()); - env->ExceptionClear(); - jthrowable cnfe = reinterpret_cast(env->NewObject(WellKnownClasses::java_lang_ClassNotFoundException, - WellKnownClasses::java_lang_ClassNotFoundException_init, - javaName, cause.get())); - env->Throw(cnfe); - return NULL; - } - if (initialize) { - class_linker->EnsureInitialized(c, true, true); - } - return soa.AddLocalReference(c); -} - -static jint Class_getAnnotationDirectoryOffset(JNIEnv* env, jclass javaClass) { - ScopedObjectAccess soa(env); - mirror::Class* c = DecodeClass(soa, javaClass); - if (c->IsPrimitive() || c->IsArrayClass() || c->IsProxyClass()) { - return 0; // primitive, array and proxy classes don't have class definitions - } - const DexFile::ClassDef* class_def = ClassHelper(c).GetClassDef(); - if (class_def == NULL) { - return 0; // not found - } else { - return class_def->annotations_off_; - } -} - -static jobject Class_getDex(JNIEnv* env, jobject javaClass) { - ScopedObjectAccess soa(env); - mirror::Class* c = DecodeClass(soa, javaClass); - - mirror::DexCache* dex_cache = c->GetDexCache(); - if (dex_cache == NULL) { - return NULL; - } - const DexFile* dex_file = dex_cache->GetDexFile(); - if (dex_file == NULL) { - return NULL; - } - return dex_file->GetDexObject(env); -} - -static jstring Class_getNameNative(JNIEnv* env, jobject javaThis) { - ScopedObjectAccess soa(env); - mirror::Class* c = DecodeClass(soa, javaThis); - return soa.AddLocalReference(c->ComputeName()); -} - -static jobjectArray Class_getProxyInterfaces(JNIEnv* env, jobject javaThis) { - ScopedObjectAccess soa(env); - mirror::SynthesizedProxyClass* c = - down_cast(DecodeClass(soa, javaThis)); - return soa.AddLocalReference(c->GetInterfaces()->Clone(soa.Self())); -} - -static JNINativeMethod gMethods[] = { - NATIVE_METHOD(Class, classForName, "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;"), - NATIVE_METHOD(Class, getAnnotationDirectoryOffset, "()I"), - NATIVE_METHOD(Class, getDex, "()Lcom/android/dex/Dex;"), - NATIVE_METHOD(Class, getNameNative, "()Ljava/lang/String;"), - NATIVE_METHOD(Class, getProxyInterfaces, "()[Ljava/lang/Class;"), -}; - -void register_java_lang_Class(JNIEnv* env) { - REGISTER_NATIVE_METHODS("java/lang/Class"); -} - -} // namespace art -- cgit v1.2.3-59-g8ed1b