Merge "Make the error more instructive on missing android_jar_path" am: 8fff584906 am: 10ef03e4fc am: 858ad8b026

Change-Id: I1707f017f30dafeba0822d813a7fee160d631859
This commit is contained in:
Automerger Merge Worker 2020-01-29 03:52:03 +00:00
commit da8d330980
1 changed files with 3 additions and 2 deletions

View File

@ -124,8 +124,9 @@ class ApexApkSigner(object):
android_jar_path = common.OPTIONS.android_jar_path
if not android_jar_path:
android_jar_path = os.path.join(os.environ.get(
'ANDROID_BUILD_TOP'), 'prebuilts/sdk/current/public/android.jar')
android_jar_path = os.path.join(os.environ.get('ANDROID_BUILD_TOP', ''),
'prebuilts', 'sdk', 'current', 'public',
'android.jar')
logger.warning('android_jar_path not found in options, falling back to'
' use %s', android_jar_path)