commit 4c474617d491fe98fa02571349138fb757959232
author Shinichiro Hamaji <hamaji@google.com> Thu Jan 28 17:00:33 2016 +0900
committer Shinichiro Hamaji <hamaji@google.com> Thu Jan 28 17:03:02 2016 +0900
tree e305b81822949074e962aff578af63253d915365
parent 4a97cde443829f1a3bf40fe6e820ba5b01e3bf87

Use dependency files generated by llvm-rs-cc for Java

This is similar to 2e45fd036ad308cfa6094b181a67f97002ebf10f
but this CL is for generated java code.

For C++ code llvm-rs-cc defines two targets but it defines
three targets for Java. The sed script was updated to handle
both cases appropriately.

Bug: 26839129
Change-Id: I5c7705c67f3c65c4c14f74558e603f8ec9f35879

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index a0ab4c5..c070583 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -215,7 +215,7 @@
 	$(transform-renderscripts-to-java-and-bc)
 
 # include the dependency files (.d/.P) generated by llvm-rs-cc.
--include $(bc_dep_files:%.d=%.P)
+$(call include-depfile,$(RenderScript_file_stamp).P,$(RenderScript_file_stamp))
 
 ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)