Restructure to avoid bad things with unknown builder

This still isn't totally satisfactory... Android-mode basically just appears to stop working, and the error message never really gets seen...
remvee · May 25, 2014 · ff26300 · ff26300
1 parent 4ff130b
commit ff26300
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/android-mode.el b/android-mode.el
@@ -148,12 +148,13 @@ way.")
 
 (defun android-root ()
   "Look for AndroidManifest.xml file to find project root of android application."
-  (locate-dominating-file
-   default-directory
-   (or (plist-get android-mode-root-file-plist
-                  android-mode-builder)
-       (error "%s was not found in `android-mode-root-file-plist'"
-              android-mode-builder))))
+  (let ((dominating-file (plist-get android-mode-root-file-plist
+                                    android-mode-builder)))
+    (if dominating-file
+        (locate-dominating-file default-directory dominating-file)
+      (message "%s was not found in `android-mode-root-file-plist'"
+               android-mode-builder)
+      nil)))
 
 (defmacro android-in-root (body)
   "Execute BODY form with project root directory as