commit d3ce14c325438b5383c9a12f4656bd4d5f25079f
author Shinichiro Hamaji <hamaji@google.com> Tue Mar 29 03:29:21 2016 +0900
committer Shinichiro Hamaji <hamaji@google.com> Wed Mar 30 03:04:40 2016 +0900
tree 519eee84bb8d45c34ae9077566093a289a492237
parent 8fe0fc90653bfd40634d946002fd0e12b59f1022

Fix dependencies around tools/*-event-log-tags.py

We should regenerate merged tag files and java sources when
these scripts are updated.

Change-Id: Id5f11d6f480f3f74dab08f01e929ee2d7fafd2d0

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 6fb16ea..32ec8e4 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -354,7 +354,8 @@
 logtags_java_sources := $(patsubst %.logtags,%.java,$(addprefix $(intermediates.COMMON)/src/, $(logtags_sources)))
 logtags_sources := $(addprefix $(LOCAL_PATH)/, $(logtags_sources))
 
-$(logtags_java_sources): $(intermediates.COMMON)/src/%.java: $(LOCAL_PATH)/%.logtags $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt
+$(logtags_java_sources): PRIVATE_MERGED_TAG := $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt
+$(logtags_java_sources): $(intermediates.COMMON)/src/%.java: $(LOCAL_PATH)/%.logtags $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt $(JAVATAGS) build/tools/event_log_tags.py
 	$(transform-logtags-to-java)
 
 else