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

am: 0c470d3b8c

Change-Id: I984e29ff580ed1c361f22a7357c53dd4a24961c3
This commit is contained in:
Pavel Salomatov 2019-03-11 14:11:35 -07:00 committed by android-build-merger
commit 9a5bc48596
1 changed files with 8 additions and 2 deletions

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)