Merge "Make the error more instructive on missing android_jar_path"

2020-01-29 03:19:23 +00:00
parent dac25a96df 61a792f323
commit 8fff584906
1 changed files with 3 additions and 2 deletions
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -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)