commit 52a1d6c666832f6bfa1c319c909d0189bc2d97bd
author Shinichiro Hamaji <hamaji@google.com> Mon Feb 01 17:59:01 2016 +0900
committer Shinichiro Hamaji <hamaji@google.com> Mon Feb 01 17:59:01 2016 +0900
tree 99ee590f431dd679eac244402bcb3dfdb93da057
parent d6184e1da9e56b0b66cba48756ce210564d34523

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

This is a reland of 4c474617d491fe98fa02571349138fb757959232
This time, we use awk instead of sed, and the script works
on Mac.

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: I1bca7d253764554d552950e03deedabaa9b7f17e

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 4680c19..9e78215 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),)