openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Add compatibility for custom out directory." 

am: b6f2f8b2d9

Change-Id: I93b394aed846563a54a9c83a3705f91ffbc2cc01
This commit is contained in:
Pavel Salomatov 2019-03-11 13:14:37 -07:00 committed by android-build-merger
parent 37e3fd9887 b6f2f8b2d9
commit 0c470d3b8c
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): class Options(object):
def __init__(self): 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 = { platform_search_path = {
"linux2": "out/host/linux-x86", "linux2": os.path.join(base_search_path, "host/linux-x86"),
"darwin": "out/host/darwin-x86", "darwin": os.path.join(base_search_path, "host/darwin-x86"),
} }
self.search_path = platform_search_path.get(sys.platform) self.search_path = platform_search_path.get(sys.platform)