commit 53c627bdc205835f80d9c84706becebe86302db9
author android-build-team Robot <android-build-team-robot@google.com> Thu Jun 01 07:33:07 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 01 07:33:07 2017 +0000
tree 16cbc42364994cee6f0479f575e906f7dcad4755
parent 899300e9d621866969fab2eb2bf3baaef44aeba7
parent 9c29690314577c966c69c481547d3c376abb257f

release-request-e5546013-e96c-4ee5-90aa-42a79d072375-for-git_oc-dr1-release-4057695 snap-temp-L89700000069427448

Change-Id: I948ea4fc263612fc0143707023ddd06e048dfb97

devlib/utils/android.py

diff --git a/devlib/utils/android.py b/devlib/utils/android.py
index bd49ea4..be8b960 100644
--- a/devlib/utils/android.py
+++ b/devlib/utils/android.py
@@ -451,7 +451,15 @@
     logger.debug('Discovering ANDROID_HOME from adb path.')
     env.platform_tools = os.path.dirname(adb_full_path)
     env.android_home = os.path.dirname(env.platform_tools)
-    _init_common(env)
+    try:
+        _init_common(env)
+    except:
+        env.aapt = which('aapt')
+        if env.aapt:
+            logger.info('Using aapt: ' + env.aapt)
+        else:
+            raise RuntimeError('aapt not found, try setting ANDROID_HOME to \
+                                Android SDK or run LISA from android environment')
     return env