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

Merge changes from topic "merge_cc_logtags" into main

Browse Source 
* changes:
  Add LOCAL_SOONG_LOGTAGS_FILES
  Add python Soong modules for logtags
This commit is contained in:
Inseob Kim
2024-05-03 05:10:23 +00:00
committed by Gerrit Code Review
parent 09c5581b12 beff4ab9a2
commit ab47e15dd1
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/base_rules.mk
View File

@@ -393,8 +393,8 @@ endif
logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES)) $(LOCAL_LOGTAGS_FILES) logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES)) $(LOCAL_LOGTAGS_FILES)
ifneq ($(strip $(logtags_sources)),) ifneq ($(strip $(logtags_sources) $(LOCAL_SOONG_LOGTAGS_FILES)),)
event_log_tags := $(foreach f,$(addprefix $(LOCAL_PATH)/,$(logtags_sources)),$(call clean-path,$(f))) event_log_tags := $(foreach f,$(LOCAL_SOONG_LOGTAGS_FILES) $(addprefix $(LOCAL_PATH)/,$(logtags_sources)),$(call clean-path,$(f)))
else else
event_log_tags := event_log_tags :=
endif endif

1
core/clear_vars.mk
View File

@@ -264,6 +264,7 @@ LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
LOCAL_SOONG_LICENSE_METADATA := LOCAL_SOONG_LICENSE_METADATA :=
LOCAL_SOONG_LINK_TYPE := LOCAL_SOONG_LINK_TYPE :=
LOCAL_SOONG_LINT_REPORTS := LOCAL_SOONG_LINT_REPORTS :=
LOCAL_SOONG_LOGTAGS_FILES :=
LOCAL_SOONG_MODULE_INFO_JSON := LOCAL_SOONG_MODULE_INFO_JSON :=
LOCAL_SOONG_MODULE_TYPE := LOCAL_SOONG_MODULE_TYPE :=
LOCAL_SOONG_PROGUARD_DICT := LOCAL_SOONG_PROGUARD_DICT :=

8
tools/Android.bp
View File

@@ -115,3 +115,11 @@ python_binary_host {
}, },
}, },
} }
python_binary_host {
name: "merge-event-log-tags",
srcs: [
"event_log_tags.py",
"merge-event-log-tags.py",
],
}