commit 12e6d7446384a7a5fbec25fe116bbb271c62842e
author Tsu Chiang Chuang <tsu@google.com> Thu May 22 10:22:25 2014 -0700
committer Brian Carlstrom <bdc@google.com> Tue May 27 22:55:53 2014 -0700
tree ced17862a2587c56cb53fe47b303841aac806dc6
parent 9bec54430e8609765740fdc51d24ed3f3c907919

Add option to specify compiler executable.

Change-Id: I973da5e74be5a62461caacbc708288fb95e1b99b

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index afff7a2..b9c42ee 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -563,8 +563,7 @@
                                   const char* oat_cache_filename,
                                   std::string* error_msg) {
   Locks::mutator_lock_->AssertNotHeld(Thread::Current());  // Avoid starving GC.
-  std::string dex2oat(GetAndroidRoot());
-  dex2oat += (kIsDebugBuild ? "/bin/dex2oatd" : "/bin/dex2oat");
+  std::string dex2oat(Runtime::Current()->GetCompilerExecutable());
 
   gc::Heap* heap = Runtime::Current()->GetHeap();
   std::string boot_image_option("--boot-image=");