StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk."

Browse Source 
* commit 'af72e1b3e68f449c81054bc25e655016529914e1':
  Move part of logtags stuff back to base_rules.mk.
This commit is contained in:
Ying Wang
2015-09-04 17:56:24 +00:00
committed by Android Git Automerger
parent 2f44006a4b af72e1b3e6
commit cbac87899b
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/java.mk
View File

@@ -315,25 +315,6 @@ else
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
@@ -350,6 +331,21 @@ endif
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))