Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" am: 476b5b1616

am: 58b7c1c744

* commit '58b7c1c744aa49fb0686848b281ae75c2485f420':
  Add LOCAL_LOGTAGS_FILES that prebuilts can use

Change-Id: I76a6077c3945463a5b52fb8a4f5146a2590de716
This commit is contained in:
Dan Willemsen
2016-06-01 23:53:44 +00:00
committed by android-build-merger
2 changed files with 2 additions and 1 deletions

View File

@@ -261,7 +261,7 @@ endif
## 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))

View File

@@ -207,6 +207,7 @@ LOCAL_SHARED_ANDROID_LIBRARIES:=
# 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):=