commit 476b5b161613cc352961414b549a0553361d533b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 01 23:28:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 01 23:28:10 2016 +0000
tree 404459ee38de9adc60cc5f3cc4021d5a0b2f4b09
parent 4bc8280a9886d93870fab02eea73986d8ca08965
parent b0a08b874ccfc4360079de115aa72c8ec6368e80

Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index c4fbe11..30b6c1c 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -261,7 +261,7 @@
 ## logtags: Add .logtags files to global list
 ###########################################################
 
-logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES))
+logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES)) $(LOCAL_LOGTAGS_FILES)
 
 ifneq ($(strip $(logtags_sources)),)
 event_log_tags := $(addprefix $(LOCAL_PATH)/,$(logtags_sources))

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index bc1eefb..9ca880b 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -197,6 +197,7 @@
 # to avoid installing the presigned apks with classes.dex unstripped.
 LOCAL_REPLACE_PREBUILT_APK_INSTALLED:=
 LOCAL_NDK_VERSION:=current
+LOCAL_LOGTAGS_FILES:=
 
 # arch specific variables
 LOCAL_SRC_FILES_$(TARGET_ARCH):=