commit 5439f051a950f0281eeafb8e8064839f2aea6e38
author Ulya Trafimovich <skvadrik@google.com> Wed Jul 29 10:03:46 2020 +0100
committer Ulyana Trafimovich <skvadrik@google.com> Wed Jul 29 13:58:15 2020 +0000
tree 889efef779fa462357f77cb2166c600cb0d60679
parent 483bf78ae61ab43a3d513cef0de0072e86d0b0b1

Revert^3 "VIXL simulator for ART (Stage1)"

This reverts commit e886d68b9c40c941d8966b9c90d0e265c75fb19e.

Reason for revert: simulator implemention is not ready yet.

Test: lunch aosp_cf_x86_phone-userdebug && m
Test: art/test.py --run-test --optimizing --host
Change-Id: I03c8c09ea348205b0238d7a26caef3477cd6ae3b

runtime/native/java_lang_VMClassLoader.cc

diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc
index 27dd970..11e02a2 100644
--- a/runtime/native/java_lang_VMClassLoader.cc
+++ b/runtime/native/java_lang_VMClassLoader.cc
@@ -143,10 +143,8 @@
     const DexFile* dex_file = path[i];
 
     // For multidex locations, e.g., x.jar!classes2.dex, we want to look into x.jar.
-    std::string location(DexFileLoader::GetBaseLocation(dex_file->GetLocation()));
-    if (Runtime::SimulatorMode()) {
-      location = getenv("ANDROID_PRODUCT_OUT") + location;
-    }
+    const std::string location(DexFileLoader::GetBaseLocation(dex_file->GetLocation()));
+
     ScopedLocalRef<jstring> javaPath(env, env->NewStringUTF(location.c_str()));
     if (javaPath.get() == nullptr) {
       DCHECK(env->ExceptionCheck());