Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff82e82a authored by Yasuhiro Matsuda's avatar Yasuhiro Matsuda
Browse files

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
parent 4379e2b8

core/base_rules.mk

+13 −0
Original line number Original line Diff line number Diff line
@@ -194,6 +194,17 @@ endif 
# Assemble the list of targets to create PRIVATE_ variables for.

# Assemble the list of targets to create PRIVATE_ variables for.

LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE)

LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE)





###########################################################

## logtags: Add .logtags files to global list

###########################################################



logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES))



ifneq ($(strip $(logtags_sources)),)

event_log_tags := $(addprefix $(LOCAL_PATH)/,$(logtags_sources))

else

event_log_tags :=

endif





###########################################################

###########################################################

## make clean- targets

## make clean- targets
@@ -336,6 +347,8 @@ my_required_modules += $(LOCAL_REQUIRED_MODULES_$($(my_prefix)OS)) 
endif

endif

ALL_MODULES.$(my_register_name).REQUIRED := \

ALL_MODULES.$(my_register_name).REQUIRED := \

    $(strip $(ALL_MODULES.$(my_register_name).REQUIRED) $(my_required_modules))

    $(strip $(ALL_MODULES.$(my_register_name).REQUIRED) $(my_required_modules))

ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS := \

    $(ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS) $(event_log_tags)

ALL_MODULES.$(my_register_name).MAKEFILE := \

ALL_MODULES.$(my_register_name).MAKEFILE := \

    $(ALL_MODULES.$(my_register_name).MAKEFILE) $(LOCAL_MODULE_MAKEFILE)

    $(ALL_MODULES.$(my_register_name).MAKEFILE) $(LOCAL_MODULE_MAKEFILE)

ifdef LOCAL_MODULE_OWNER

ifdef LOCAL_MODULE_OWNER

core/java.mk

+15 −19
Original line number Original line Diff line number Diff line
@@ -303,25 +303,6 @@ else 
aidl_java_sources :=

aidl_java_sources :=

endif

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

# All of the rules after full_classes_compiled_jar are very unlikely
@@ -338,6 +319,21 @@ endif 
include $(BUILD_SYSTEM)/base_rules.mk

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) \

java_sources := $(addprefix $(LOCAL_PATH)/, $(filter %.java,$(LOCAL_SRC_FILES))) $(aidl_java_sources) $(logtags_java_sources) \

                $(filter %.java,$(LOCAL_GENERATED_SOURCES))

                $(filter %.java,$(LOCAL_GENERATED_SOURCES))

core/java_common.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -237,10 +237,6 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) $(PROD 
$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)





ifdef event_log_tags

ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS := \

  $(ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS) $(event_log_tags)

endif

ifdef aidl_sources

ifdef aidl_sources

ALL_MODULES.$(my_register_name).AIDL_FILES := $(aidl_sources)

ALL_MODULES.$(my_register_name).AIDL_FILES := $(aidl_sources)

endif

endif