StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add EMMA_INSTRUMENT_STATIC support

Browse Source 
Add jacocoagent when instrumenting with EMMA_INSTRUMENT_STATIC.

Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true
Change-Id: I451bb9d16b7f0a66fd06c2da576062b28830e470
This commit is contained in:
Colin Cross
2018-01-03 15:06:47 -08:00
parent e7fa3b1b74
commit 3144dfc966
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/dex.go
View File

@@ -185,6 +185,11 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F
android.PathForSource(ctx, "build/make/core/proguard.flags"), android.PathForSource(ctx, "build/make/core/proguard.flags"),
} }
if j.shouldInstrumentStatic(ctx) {
flagFiles = append(flagFiles,
android.PathForSource(ctx, "build/make/core/proguard.jacoco.flags"))
}
flagFiles = append(flagFiles, j.extraProguardFlagFiles...) flagFiles = append(flagFiles, j.extraProguardFlagFiles...)
// TODO(ccross): static android library proguard files // TODO(ccross): static android library proguard files

16
java/java.go
View File

@@ -319,6 +319,16 @@ func sdkStringToNumber(ctx android.BaseContext, v string) int {
} }
} }
func (j *Module) shouldInstrument(ctx android.BaseContext) bool {
return j.properties.Instrument && ctx.Config().IsEnvTrue("EMMA_INSTRUMENT")
}
func (j *Module) shouldInstrumentStatic(ctx android.BaseContext) bool {
return j.shouldInstrument(ctx) &&
(ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_STATIC") ||
ctx.Config().UnbundledBuild())
}
func decodeSdkDep(ctx android.BaseContext, v string) sdkDep { func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
i := sdkStringToNumber(ctx, v) i := sdkStringToNumber(ctx, v)
if i == -1 { if i == -1 {
@@ -443,6 +453,10 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
// Kotlin files // Kotlin files
ctx.AddDependency(ctx.Module(), kotlinStdlibTag, "kotlin-stdlib") ctx.AddDependency(ctx.Module(), kotlinStdlibTag, "kotlin-stdlib")
} }
if j.shouldInstrumentStatic(ctx) {
ctx.AddDependency(ctx.Module(), staticLibTag, "jacocoagent")
}
} }
func hasSrcExt(srcs []string, ext string) bool { func hasSrcExt(srcs []string, ext string) bool {
@@ -871,7 +885,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
} }
} }
if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT") && j.properties.Instrument { if j.shouldInstrument(ctx) {
outputFile = j.instrument(ctx, flags, outputFile, jarName) outputFile = j.instrument(ctx, flags, outputFile, jarName)
} }