Fix resource_sizes.py breaking if CWD!=src

BUG=678338

Review-Url: https://codereview.chromium.org/2761883002
Cr-Original-Commit-Position: refs/heads/master@{#458160}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5664563554b429cc617b0ea8ebdd77293852492e
This commit is contained in:
agrieve 2017-03-20 13:12:40 -07:00 коммит произвёл Commit bot
Родитель 2338bdddf7
Коммит 8f1a42a755
2 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -52,7 +52,8 @@ if (enable_java_templates) {
_data += _data +=
"android_sdk_root=" + rebase_path(android_sdk_root, root_build_dir) + CR "android_sdk_root=" + rebase_path(android_sdk_root, root_build_dir) + CR
_data += "android_sdk_version=$android_sdk_version$CR" _data += "android_sdk_version=$android_sdk_version$CR"
_data += "android_tool_prefix=$android_tool_prefix" _data += "android_tool_prefix=" +
rebase_path(android_tool_prefix, root_build_dir) + CR
write_file("$root_build_dir/build_vars.txt", _data) write_file("$root_build_dir/build_vars.txt", _data)
} }

Просмотреть файл

@ -723,7 +723,8 @@ def main():
constants.CheckOutputDirectory() constants.CheckOutputDirectory()
devil_chromium.Initialize() devil_chromium.Initialize()
build_vars = _ReadBuildVars(constants.GetOutDirectory()) build_vars = _ReadBuildVars(constants.GetOutDirectory())
tools_prefix = build_vars['android_tool_prefix'] tools_prefix = os.path.join(constants.GetOutDirectory(),
build_vars['android_tool_prefix'])
else: else:
tools_prefix = '' tools_prefix = ''