Fix signapk not found error when running ota_from_target_files locally
location of ota_from_target_files changed from out/host/linux-x86/bin to out/soong/host/linux-x86/bin . This changes relative position of signapj.jar. To fix, use ANDROID_HOST_OUT as search path Change-Id: I5397171566e9d7598b5ef16ae26641f0c183d748
This commit is contained in:
@@ -68,6 +68,9 @@ class Options(object):
|
||||
self.search_path = os.path.dirname(os.path.dirname(exec_path))
|
||||
|
||||
self.signapk_path = "framework/signapk.jar" # Relative to search_path
|
||||
if not os.path.exists(os.path.join(self.search_path, self.signapk_path)):
|
||||
if "ANDROID_HOST_OUT" in os.environ:
|
||||
self.search_path = os.environ["ANDROID_HOST_OUT"]
|
||||
self.signapk_shared_library_path = "lib64" # Relative to search_path
|
||||
self.extra_signapk_args = []
|
||||
self.java_path = "java" # Use the one on the path by default.
|
||||
@@ -973,6 +976,8 @@ class PartitionBuildProps(object):
|
||||
break
|
||||
except KeyError:
|
||||
logger.warning('Failed to read %s', prop_file)
|
||||
if data == '':
|
||||
logger.warning("Failed to read build.prop for partition {}".format(name))
|
||||
return data
|
||||
|
||||
@staticmethod
|
||||
|
Reference in New Issue
Block a user