diff options
| author | Colin Cross <ccross@android.com> | 2017-12-07 15:28:59 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-12-07 15:32:30 -0800 |
| commit | 5beccee92cfa5e13fbebb3d670f0dc65b7ba802c (patch) | |
| tree | 353c0cb2871600f3aba7ac26dffb60ef9aca3b26 /cc/androidmk.go | |
| parent | 4b9bb14dd2b6b606078187f555ceffce9c6c8a41 (diff) | |
| download | build_soong-5beccee92cfa5e13fbebb3d670f0dc65b7ba802c.tar.gz build_soong-5beccee92cfa5e13fbebb3d670f0dc65b7ba802c.tar.bz2 build_soong-5beccee92cfa5e13fbebb3d670f0dc65b7ba802c.zip | |
Split logtags implementations for cc and java
Logtags files in cc and java are treated fundamentally differently.
In cc, they are not used for compiling at all, but need to be passed
to Make to be combined into the global logtags list, and logtag files
are listed in a logtags property. In java they are listed in srcs
and produce generated code that is compiled in, and so shouldn't
also need to be listed in a logtags property.
Move the logtags property to cc and export it to Make from there,
and have java extract logtags files from srcs to be exported to
Make.
Test: m checkbuild
Change-Id: I31d49289efe72db60d2f33566df771b4a3ebc8a0
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 73112637..1db53737 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -60,6 +60,9 @@ func (c *Module) AndroidMk() android.AndroidMkData { OutputFile: c.outputFile, Extra: []android.AndroidMkExtraFunc{ func(w io.Writer, outputFile android.Path) { + if len(c.Properties.Logtags) > 0 { + fmt.Fprintln(w, "LOCAL_LOGTAGS_FILES :=", strings.Join(c.Properties.Logtags, " ")) + } fmt.Fprintln(w, "LOCAL_SANITIZE := never") if len(c.Properties.AndroidMkSharedLibs) > 0 { fmt.Fprintln(w, "LOCAL_SHARED_LIBRARIES := "+strings.Join(c.Properties.AndroidMkSharedLibs, " ")) |