Commit 12baf8c8 authored by Eric Stevenson's avatar Eric Stevenson Committed by Commit Bot

Android: Modify package resources post processing.

This CL adds support for extra post processing after package_resources
is complete, including modifying the R.java files that are used.

Bug: 762130
Change-Id: I25fdc9a4bd9f2a13620036cb6988dced8d2602ea
Reviewed-on: https://chromium-review.googlesource.com/761676
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: default avataragrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522335}
parent c1ab361d
...@@ -1389,6 +1389,9 @@ if (enable_java_templates) { ...@@ -1389,6 +1389,9 @@ if (enable_java_templates) {
# Runs process_resources.py # Runs process_resources.py
template("process_resources") { template("process_resources") {
_process_resources_target_name = target_name _process_resources_target_name = target_name
if (defined(invoker.srcjar_path)) {
_srcjar_path = invoker.srcjar_path
}
if (defined(invoker.output)) { if (defined(invoker.output)) {
_post_process = defined(invoker.post_process_script) _post_process = defined(invoker.post_process_script)
_packaged_resources_path = invoker.output _packaged_resources_path = invoker.output
...@@ -1398,6 +1401,11 @@ if (enable_java_templates) { ...@@ -1398,6 +1401,11 @@ if (enable_java_templates) {
get_path_info(_packaged_resources_path, "dir") + "/" + get_path_info(_packaged_resources_path, "dir") + "/" +
get_path_info(_packaged_resources_path, "name") + get_path_info(_packaged_resources_path, "name") +
".intermediate.ap_" ".intermediate.ap_"
# TODO(estevenson): Remove this check.
if (defined(invoker.post_process_args)) {
_srcjar_path = "${_srcjar_path}.intermediate.srcjar"
}
} }
} }
action(_process_resources_target_name) { action(_process_resources_target_name) {
...@@ -1514,11 +1522,11 @@ if (enable_java_templates) { ...@@ -1514,11 +1522,11 @@ if (enable_java_templates) {
] ]
} }
if (defined(invoker.srcjar_path)) { if (defined(_srcjar_path)) {
outputs += [ invoker.srcjar_path ] outputs += [ _srcjar_path ]
args += [ args += [
"--srcjar-out", "--srcjar-out",
rebase_path(invoker.srcjar_path, root_build_dir), rebase_path(_srcjar_path, root_build_dir),
] ]
} }
...@@ -1633,6 +1641,19 @@ if (enable_java_templates) { ...@@ -1633,6 +1641,19 @@ if (enable_java_templates) {
public_deps = [ public_deps = [
":${_process_resources_target_name}", ":${_process_resources_target_name}",
] ]
# TODO(estevenson): Remove this check.
if (defined(invoker.post_process_args)) {
args += [
"--srcjar-in",
rebase_path(_srcjar_path, root_build_dir),
"--srcjar-out",
rebase_path(invoker.srcjar_path, root_build_dir),
] + invoker.post_process_args
inputs += [ _srcjar_path ]
outputs += [ invoker.srcjar_path ]
public_deps += invoker.post_process_deps
}
} }
} }
} }
......
...@@ -2048,6 +2048,12 @@ if (enable_java_templates) { ...@@ -2048,6 +2048,12 @@ if (enable_java_templates) {
version_name = _version_name version_name = _version_name
if (defined(invoker.post_process_package_resources_script)) { if (defined(invoker.post_process_package_resources_script)) {
post_process_script = invoker.post_process_package_resources_script post_process_script = invoker.post_process_package_resources_script
# TODO(estevenson): Remove this check.
if (defined(invoker.post_process_package_resources_deps)) {
post_process_deps = invoker.post_process_package_resources_deps
post_process_args = invoker.post_process_package_resources_args
}
} }
srcjar_path = "${target_gen_dir}/${target_name}.srcjar" srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
r_text_out_path = "${target_gen_dir}/${target_name}_R.txt" r_text_out_path = "${target_gen_dir}/${target_name}_R.txt"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment