Merge "Rename ApexName to ApexVariationName" am: a07777d434 am: be9a9035f2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399831

Change-Id: I31f1d4eedbad29ac1562834ea70eb52e0c543ecd
This commit is contained in:
Treehugger Robot
2020-08-15 07:02:47 +00:00
committed by Automerger Merge Worker
9 changed files with 37 additions and 37 deletions

View File

@@ -1684,7 +1684,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
j.linter.compileSdkVersion = lintSDKVersionString(j.sdkVersion())
j.linter.javaLanguageLevel = flags.javaVersion.String()
j.linter.kotlinLanguageLevel = "1.3"
if j.ApexName() != "" && ctx.Config().UnbundledBuildApps() {
if j.ApexVariationName() != "" && ctx.Config().UnbundledBuildApps() {
j.linter.buildModuleReportZip = true
}
j.linter.lint(ctx)