commit 88ab5318318219d6838e617082f4587baf18f98d
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 10 12:31:32 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 10 12:31:32 2020 +0000
tree 94eb4ef8af8c9f0412173a00f9dd2f3f9c7910ce
parent c30b734f427915ecc92677017b71d6e005d806bf
parent 34ea73940e0bebb9c166856dbcebafd14b7348dc

Merge "Go one directory up looking for releasetools path"

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index b0a0e02..6a6f119 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -62,7 +62,7 @@
           'Warning: releasetools script should be invoked as hermetic Python '
           'executable -- build and run `{}` directly.'.format(script_name[:-3]),
           file=sys.stderr)
-    self.search_path = os.path.realpath(os.path.join(exec_path, '..'))
+    self.search_path = os.path.realpath(os.path.join(os.path.dirname(exec_path), '..'))
 
     self.signapk_path = "framework/signapk.jar"  # Relative to search_path
     self.signapk_shared_library_path = "lib64"   # Relative to search_path