Move Android version stamping from an exec_script -> build rule

BUG=

Review URL: https://codereview.chromium.org/1229073003

Cr-Original-Commit-Position: refs/heads/master@{#338292}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5f3dec8ead48312eea0b4a27329c4faf231333c7
This commit is contained in:
agrieve 2015-07-10 08:18:36 -07:00 коммит произвёл Commit bot
Родитель c341d03847
Коммит 478e342ca0
2 изменённых файлов: 31 добавлений и 4 удалений

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

@ -1449,9 +1449,13 @@ template("android_apk") {
_enable_relocation_packing = true
}
_native_lib_version_name = ""
if (defined(invoker.native_lib_version_name)) {
_native_lib_version_name = invoker.native_lib_version_name
_native_lib_version_rule = ""
if (defined(invoker.native_lib_version_rule)) {
_native_lib_version_rule = invoker.native_lib_version_rule
}
_native_lib_version_arg = "\"\""
if (defined(invoker.native_lib_version_arg)) {
_native_lib_version_arg = invoker.native_lib_version_arg
}
}
@ -1532,11 +1536,14 @@ template("android_apk") {
deps = [
":$build_config_target",
]
if (_native_lib_version_rule != "") {
deps += [ _native_lib_version_rule ]
}
defines = [
"NATIVE_LIBRARIES_LIST=" +
"@FileArg($_rebased_build_config:native:java_libraries_list)",
"NATIVE_LIBRARIES_VERSION_NUMBER=\"$_native_lib_version_name\"",
"NATIVE_LIBRARIES_VERSION_NUMBER=$_native_lib_version_arg",
]
if (_use_chromium_linker) {
defines += [ "ENABLE_CHROMIUM_LINKER" ]

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

@ -26,3 +26,23 @@ action("webkit_version") {
rebase_path(output_file, root_build_dir),
]
}
action("chrome_version_json") {
script = "version.py"
_chrome_version_path = "//chrome/VERSION"
inputs = [
_chrome_version_path,
]
_output_file = "$root_gen_dir/CHROME_VERSION.json"
outputs = [
_output_file,
]
args = [
"--file",
rebase_path(_chrome_version_path, root_build_dir),
"--template",
"{\"full-quoted\": \"\\\"@MAJOR@.@MINOR@.@BUILD@.@PATCH@\\\"\"}",
"--output",
rebase_path(_output_file, root_build_dir),
]
}