commit a56fcd60596ae8694da21fccde5c56832e437c56
author Brian Carlstrom <bdc@google.com> Sat Feb 04 21:23:01 2012 -0800
committer Brian Carlstrom <bdc@google.com> Sat Feb 04 22:48:30 2012 -0800
tree 522352376c179e452706bacad29c00f6fc5acb7f
parent b12552a95d68b9e4a567103190074ae47b6a61dc

Honor ANDROID_ROOT and ANDROID_DATA

Change-Id: I8e43093830a734694bbf7308d08dd18527302270

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 32082d3..9d53f93 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -568,7 +568,8 @@
 bool ClassLinker::GenerateOatFile(const std::string& dex_filename,
                                   int oat_fd,
                                   const std::string& oat_cache_filename) {
-  std::string dex2oat_string("/system/bin/dex2oat");
+  std::string dex2oat_string(GetAndroidRoot());
+  dex2oat_string += "/bin/dex2oat";
 #ifndef NDEBUG
   dex2oat_string += 'd';
 #endif