Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"

This commit is contained in:
Treehugger Robot 2016-06-01 23:28:10 +00:00 committed by Gerrit Code Review
commit 476b5b1616
2 changed files with 2 additions and 1 deletions

View File

@ -261,7 +261,7 @@ endif
## logtags: Add .logtags files to global list ## 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)),) ifneq ($(strip $(logtags_sources)),)
event_log_tags := $(addprefix $(LOCAL_PATH)/,$(logtags_sources)) event_log_tags := $(addprefix $(LOCAL_PATH)/,$(logtags_sources))

View File

@ -197,6 +197,7 @@ LOCAL_NOTICE_FILE:=
# to avoid installing the presigned apks with classes.dex unstripped. # to avoid installing the presigned apks with classes.dex unstripped.
LOCAL_REPLACE_PREBUILT_APK_INSTALLED:= LOCAL_REPLACE_PREBUILT_APK_INSTALLED:=
LOCAL_NDK_VERSION:=current LOCAL_NDK_VERSION:=current
LOCAL_LOGTAGS_FILES:=
# arch specific variables # arch specific variables
LOCAL_SRC_FILES_$(TARGET_ARCH):= LOCAL_SRC_FILES_$(TARGET_ARCH):=