Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61a792f3 authored by Tianjie Xu's avatar Tianjie Xu
Browse files

Make the error more instructive on missing android_jar_path 

So when $ANDROID_BUILD_TOP is missing, the error message print out the
path of the missing file; instead of a type error.

Bug: 148452817
Test: check result with missing ANDROID_BUILD_TOP
Change-Id: I5f841f6626eb3843364f20e78b278d3244505396
parent 62f97c7f

tools/releasetools/apex_utils.py

+3 −2
Original line number Diff line number Diff line
@@ -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)