diff options
| -rw-r--r-- | runtime/instrumentation.cc | 8 | ||||
| -rw-r--r-- | test/Android.mk | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc index 8316bc56b3..8cf486f54d 100644 --- a/runtime/instrumentation.cc +++ b/runtime/instrumentation.cc @@ -61,10 +61,10 @@ bool Instrumentation::InstallStubsForClass(mirror::Class* klass) { bool is_initialized = klass->IsInitialized(); for (size_t i = 0; i < klass->NumDirectMethods(); i++) { mirror::ArtMethod* method = klass->GetDirectMethod(i); - if (!method->IsAbstract()) { + if (!method->IsAbstract() && !method->IsProxyMethod()) { const void* new_code; if (uninstall) { - if (forced_interpret_only_ && !method->IsNative() && !method->IsProxyMethod()) { + if (forced_interpret_only_ && !method->IsNative()) { new_code = GetCompiledCodeToInterpreterBridge(); } else if (is_initialized || !method->IsStatic() || method->IsConstructor()) { new_code = class_linker->GetOatCodeFor(method); @@ -83,10 +83,10 @@ bool Instrumentation::InstallStubsForClass(mirror::Class* klass) { } for (size_t i = 0; i < klass->NumVirtualMethods(); i++) { mirror::ArtMethod* method = klass->GetVirtualMethod(i); - if (!method->IsAbstract()) { + if (!method->IsAbstract() && !method->IsProxyMethod()) { const void* new_code; if (uninstall) { - if (forced_interpret_only_ && !method->IsNative() && !method->IsProxyMethod()) { + if (forced_interpret_only_ && !method->IsNative()) { new_code = GetCompiledCodeToInterpreterBridge(); } else { new_code = class_linker->GetOatCodeFor(method); diff --git a/test/Android.mk b/test/Android.mk index 6d3a84a25f..6b992127e0 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -85,10 +85,9 @@ define build-art-test-dex LOCAL_JAVA_LIBRARIES := $(HOST_CORE_JARS) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_OUT) - LOCAL_BUILD_HOST_DEX := true LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_DALVIK_HOST_JAVA_LIBRARY) ART_TEST_HOST_DEX_FILES += $$(LOCAL_MODULE_PATH)/$$(LOCAL_MODULE).jar endif endef |