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/utils.cc

diff --git a/src/utils.cc b/src/utils.cc
index 97efcde..cb76636 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -700,21 +700,42 @@
   task_cpu = strtoull(fields[36].c_str(), NULL, 10);
 }
 
-std::string GetArtCacheOrDie() {
-  const char* data_root = getenv("ANDROID_DATA");
-  if (data_root == NULL) {
-    if (OS::DirectoryExists("/data")) {
-      data_root = "/data";
+const char* GetAndroidRoot() {
+  const char* android_root = getenv("ANDROID_ROOT");
+  if (android_root == NULL) {
+    if (OS::DirectoryExists("/system")) {
+      android_root = "/system";
     } else {
-      data_root = "/tmp";
+      LOG(FATAL) << "ANDROID_ROOT not set and /system does not exist";
+      return "";
     }
   }
-  if (!OS::DirectoryExists(data_root)) {
-    LOG(FATAL) << "Failed to find ANDROID_DATA directory " << data_root;
+  if (!OS::DirectoryExists(android_root)) {
+    LOG(FATAL) << "Failed to find ANDROID_ROOT directory " << android_root;
     return "";
   }
+  return android_root;
+}
 
-  std::string art_cache(StringPrintf("%s/art-cache", data_root));
+const char* GetAndroidData() {
+  const char* android_data = getenv("ANDROID_DATA");
+  if (android_data == NULL) {
+    if (OS::DirectoryExists("/data")) {
+      android_data = "/data";
+    } else {
+      LOG(FATAL) << "ANDROID_DATA not set and /data does not exist";
+      return "";
+    }
+  }
+  if (!OS::DirectoryExists(android_data)) {
+    LOG(FATAL) << "Failed to find ANDROID_DATA directory " << android_data;
+    return "";
+  }
+  return android_data;
+}
+
+std::string GetArtCacheOrDie() {
+  std::string art_cache(StringPrintf("%s/art-cache", GetAndroidData()));
 
   if (!OS::DirectoryExists(art_cache.c_str())) {
     if (StringPiece(art_cache).starts_with("/tmp/")) {