commit 10ef03e4fc4aef42dd8e658ea5014c9b2ab8f45a
author Tianjie Xu <xunchang@google.com> Tue Jan 28 19:29:11 2020 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 28 19:29:11 2020 -0800
tree b58d295c6eb2a12277cad16f0f1c58a8530d5cdd
parent 0675f9d7430eed95e8e87e90fa2979433fcef8b7
parent 8fff584906f91ad3b40aad4cc5db66ca4b99b1ae

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

Change-Id: Iba00bd3511671d8b45f1e225e09aca25b6816f47

tools/releasetools/apex_utils.py

diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index 3d16d30..113f78b 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -124,8 +124,9 @@
 
     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)