commit ff82e82a1e1838b4b469fb24d4278a98dfe3ddc9
author Yasuhiro Matsuda <mazda@google.com> Fri Sep 04 16:23:49 2015 +0900
committer Yasuhiro Matsuda <mazda@google.com> Fri Sep 04 20:02:49 2015 +0900
tree f150528cad0ae72eee78188aefac68c72215a803
parent 4379e2b8bbaf2a02777f189c758e251015eb7f76

Move part of logtags stuff back to base_rules.mk.

Otherwise event tags for non-Java modules
(e.g. logcat, libsurfaceflinger) are not generated.

BUG: 23803975
Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 8972bdc..f3b57b8 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -303,25 +303,6 @@
 aidl_java_sources :=
 endif
 
-###########################################################
-## logtags: Add .logtags files to global list, emit java source
-###########################################################
-logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES))
-
-ifneq ($(strip $(logtags_sources)),)
-event_log_tags := $(addprefix $(LOCAL_PATH)/,$(logtags_sources))
-
-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
-	$(transform-logtags-to-java)
-
-else
-logtags_java_sources :=
-event_log_tags :=
-endif
-
 ##########################################
 
 # All of the rules after full_classes_compiled_jar are very unlikely
@@ -338,6 +319,21 @@
 include $(BUILD_SYSTEM)/base_rules.mk
 #######################################
 
+###########################################################
+## logtags: emit java source
+###########################################################
+ifneq ($(strip $(logtags_sources)),)
+
+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
+	$(transform-logtags-to-java)
+
+else
+logtags_java_sources :=
+endif
+
 ##########################################
 java_sources := $(addprefix $(LOCAL_PATH)/, $(filter %.java,$(LOCAL_SRC_FILES))) $(aidl_java_sources) $(logtags_java_sources) \
                 $(filter %.java,$(LOCAL_GENERATED_SOURCES))