Commit a04b788b authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Fix depfile name collision in process_resources

If an apk had a post-process action defined, and then later it was
removed, the post-process depfile would become the process_resources.py
depfile.

Change-Id: I1b5d26f800772db6c25bd6a34ce5a7a3bed75f1c
Reviewed-on: https://chromium-review.googlesource.com/890172Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532313}
parent 1fd1483e
...@@ -1435,7 +1435,7 @@ if (enable_java_templates) { ...@@ -1435,7 +1435,7 @@ if (enable_java_templates) {
]) ])
script = "//build/android/gyp/process_resources.py" script = "//build/android/gyp/process_resources.py"
depfile = "$target_gen_dir/$target_name.d" depfile = "$target_gen_dir/${invoker.target_name}_1.d"
outputs = [] outputs = []
_all_resource_dirs = [] _all_resource_dirs = []
sources = [] sources = []
...@@ -1656,7 +1656,7 @@ if (enable_java_templates) { ...@@ -1656,7 +1656,7 @@ if (enable_java_templates) {
if (defined(invoker.post_process_script)) { if (defined(invoker.post_process_script)) {
action(target_name) { action(target_name) {
depfile = "${target_gen_dir}/${target_name}.d" depfile = "${target_gen_dir}/${invoker.target_name}_2.d"
script = invoker.post_process_script script = invoker.post_process_script
args = [ args = [
"--depfile", "--depfile",
......
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