Merge "Go one directory up looking for releasetools path"

am: 88ab531831

Change-Id: Ib906e06db9c4cd2db389cdf2fb3c339436fa0130
This commit is contained in:
Robin Lee
2020-01-10 04:33:34 -08:00
committed by android-build-merger

View File

@@ -62,7 +62,7 @@ class Options(object):
'Warning: releasetools script should be invoked as hermetic Python ' 'Warning: releasetools script should be invoked as hermetic Python '
'executable -- build and run `{}` directly.'.format(script_name[:-3]), 'executable -- build and run `{}` directly.'.format(script_name[:-3]),
file=sys.stderr) 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_path = "framework/signapk.jar" # Relative to search_path
self.signapk_shared_library_path = "lib64" # Relative to search_path self.signapk_shared_library_path = "lib64" # Relative to search_path