p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

releasetools: Add compatibility for custom out directory. 

sign_target_files_apks script looks for the signapk.jar inside the out dir.
If the our dir is set to a different directory via OUT_DIR_COMMON_BASE the script does not work properly.

From now script checks if the OUT_DIR_COMMON_BASE is set, then searches the jar in the proper path.
If OUT_DIR_COMMON_BASE is unset, searches in "out" like it did before.

Test: Build with OUT_DIR_COMMON_BASE set and unset and verify that sign_target_files_apks works in both cases

Change-Id: I9218b98ff79526184f8353705640193405afac9e
This commit is contained in:
Pavel Salomatov 2019-03-06 20:00:45 +03:00
parent e34ff5ca5d
commit 3267655004
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/common.py
View File

@ -46,9 +46,15 @@ logger = logging.getLogger(__name__)
class Options(object):
def __init__(self):
base_out_path = os.getenv('OUT_DIR_COMMON_BASE')
if base_out_path is None:
base_search_path = "out"
else:
base_search_path = os.path.join(base_out_path, os.path.basename(os.getcwd()))
platform_search_path = {
"linux2": "out/host/linux-x86",
"darwin": "out/host/darwin-x86",
"linux2": os.path.join(base_search_path, "host/linux-x86"),
"darwin": os.path.join(base_search_path, "host/darwin-x86"),
}
self.search_path = platform_search_path.get(sys.platform)