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

Commit da8d3309 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make the error more instructive on missing android_jar_path" am:... 

Merge "Make the error more instructive on missing android_jar_path" am: 8fff5849 am: 10ef03e4 am: 858ad8b0

Change-Id: I1707f017f30dafeba0822d813a7fee160d631859
parents 83e55789 858ad8b0

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)