commit d59f812d78fba533c93d3b092965872768d6d295
author Vladimir Chtchetkine <vchtchetkine@google.com> Fri Jan 06 09:10:28 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 06 09:10:28 2012 -0800
tree 53e2bcde71204aa3cc175e348908e35e16c7d3b4
parent 4bcc1d92f4d49ee7331bd2eacd28d497e505c5c7
parent aef4c4e21a71298668e28659008381a62b8545cd

Merge "Fix bug in Windows audio code"

android/main-common.c

diff --git a/android/main-common.c b/android/main-common.c
index a662907..04d200a 100644
--- a/android/main-common.c
+++ b/android/main-common.c
@@ -806,12 +806,15 @@
                 exit(2);
             }
 
-            android_build_root = path_parent( out, 4 );
-            if (android_build_root == NULL || !path_exists(android_build_root)) {
-                derror("Can't find the Android build root from '%s'\n"
-                    "Please check the definition of the ANDROID_PRODUCT_OUT variable.\n"
-                    "It should point to your product-specific build output directory.\n",
-                    out );
+            android_build_root = getenv("ANDROID_BUILD_TOP");
+            if (android_build_root == NULL || android_build_root[0] == 0)
+                break;
+
+            if (!path_exists(android_build_root)) {
+                derror("Can't find the Android build root '%s'\n"
+                    "Please check the definition of the ANDROID_BUILD_TOP variable.\n"
+                    "It should point to the root of your source tree.\n",
+                    android_build_root );
                 exit(2);
             }
             android_build_out = out;