Add support for logtags am: 0fda89f4a8 am: c6b1ed56b7

am: 0d4e7bb37f

* commit '0d4e7bb37fdb3e45d4a55e788e821a40b6adeea3':
  Add support for logtags

Change-Id: I355b3f6338fc7b74320b8031c979a3dc0817bbc2

android/androidmk.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 
 	"android/soong"
 
@@ -200,6 +201,10 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
 		fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
 	} else {
 		fmt.Fprintln(w, "LOCAL_MODULE_TARGET_ARCH :=", archStr)
+
+		if len(amod.commonProperties.Logtags) > 0 {
+			fmt.Fprintln(w, "LOCAL_LOGTAGS_FILES := ", strings.Join(amod.commonProperties.Logtags, " "))
+		}
 	}
 
 	for _, extra := range data.Extra {

android/module.go

@@ -111,6 +111,10 @@ type commonProperties struct {
 	// whether this is a proprietary vendor module, and should be installed into /vendor
 	Proprietary bool
 
+	// *.logtags files, to combine together in order to generate the /system/etc/event-log-tags
+	// file
+	Logtags []string
+
 	// Set by HostOrDeviceMutator
 	CompileHostOrDevice HostOrDevice `blueprint:"mutated"`