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

Merge "Support lint on unbundled builds" am: 562b6ee5cf

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

Change-Id: I566128d420a0b0047785ca753be3603d60c5f934
This commit is contained in:
Colin Cross
2020-07-13 21:57:23 +00:00
committed by Automerger Merge Worker
parent 95393f8df1 562b6ee5cf
commit 2f67efffd7
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
java/lint.go
View File

@@ -220,12 +220,21 @@ func (l *linter) lint(ctx android.ModuleContext) {
rule.Command().Text("rm -rf").Flag(cacheDir.String()).Flag(homeDir.String()) rule.Command().Text("rm -rf").Flag(cacheDir.String()).Flag(homeDir.String())
rule.Command().Text("mkdir -p").Flag(cacheDir.String()).Flag(homeDir.String()) rule.Command().Text("mkdir -p").Flag(cacheDir.String()).Flag(homeDir.String())
var annotationsZipPath, apiVersionsXMLPath android.Path
if ctx.Config().UnbundledBuildUsePrebuiltSdks() {
annotationsZipPath = android.PathForSource(ctx, "prebuilts/sdk/current/public/data/annotations.zip")
apiVersionsXMLPath = android.PathForSource(ctx, "prebuilts/sdk/current/public/data/api-versions.xml")
} else {
annotationsZipPath = copiedAnnotationsZipPath(ctx)
apiVersionsXMLPath = copiedAPIVersionsXmlPath(ctx)
}
rule.Command(). rule.Command().
Text("("). Text("(").
Flag("JAVA_OPTS=-Xmx2048m"). Flag("JAVA_OPTS=-Xmx2048m").
FlagWithArg("ANDROID_SDK_HOME=", homeDir.String()). FlagWithArg("ANDROID_SDK_HOME=", homeDir.String()).
FlagWithInput("SDK_ANNOTATIONS=", annotationsZipPath(ctx)). FlagWithInput("SDK_ANNOTATIONS=", annotationsZipPath).
FlagWithInput("LINT_OPTS=-DLINT_API_DATABASE=", apiVersionsXmlPath(ctx)). FlagWithInput("LINT_OPTS=-DLINT_API_DATABASE=", apiVersionsXMLPath).
Tool(android.PathForSource(ctx, "prebuilts/cmdline-tools/tools/bin/lint")). Tool(android.PathForSource(ctx, "prebuilts/cmdline-tools/tools/bin/lint")).
Implicit(android.PathForSource(ctx, "prebuilts/cmdline-tools/tools/lib/lint-classpath.jar")). Implicit(android.PathForSource(ctx, "prebuilts/cmdline-tools/tools/lib/lint-classpath.jar")).
Flag("--quiet"). Flag("--quiet").
@@ -271,7 +280,7 @@ func (l *lintSingleton) GenerateBuildActions(ctx android.SingletonContext) {
} }
func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) { func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) {
if ctx.Config().UnbundledBuild() { if ctx.Config().UnbundledBuildUsePrebuiltSdks() {
return return
} }
@@ -297,25 +306,29 @@ func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: android.Cp, Rule: android.Cp,
Input: android.OutputFileForModule(ctx, frameworkDocStubs, ".annotations.zip"), Input: android.OutputFileForModule(ctx, frameworkDocStubs, ".annotations.zip"),
Output: annotationsZipPath(ctx), Output: copiedAnnotationsZipPath(ctx),
}) })
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: android.Cp, Rule: android.Cp,
Input: android.OutputFileForModule(ctx, frameworkDocStubs, ".api_versions.xml"), Input: android.OutputFileForModule(ctx, frameworkDocStubs, ".api_versions.xml"),
Output: apiVersionsXmlPath(ctx), Output: copiedAPIVersionsXmlPath(ctx),
}) })
} }
func annotationsZipPath(ctx android.PathContext) android.WritablePath { func copiedAnnotationsZipPath(ctx android.PathContext) android.WritablePath {
return android.PathForOutput(ctx, "lint", "annotations.zip") return android.PathForOutput(ctx, "lint", "annotations.zip")
} }
func apiVersionsXmlPath(ctx android.PathContext) android.WritablePath { func copiedAPIVersionsXmlPath(ctx android.PathContext) android.WritablePath {
return android.PathForOutput(ctx, "lint", "api_versions.xml") return android.PathForOutput(ctx, "lint", "api_versions.xml")
} }
func (l *lintSingleton) generateLintReportZips(ctx android.SingletonContext) { func (l *lintSingleton) generateLintReportZips(ctx android.SingletonContext) {
if ctx.Config().UnbundledBuild() {
return
}
var outputs []*lintOutputs var outputs []*lintOutputs
var dirs []string var dirs []string
ctx.VisitAllModules(func(m android.Module) { ctx.VisitAllModules(func(m android.Module) {
@@ -370,7 +383,9 @@ func (l *lintSingleton) generateLintReportZips(ctx android.SingletonContext) {
} }
func (l *lintSingleton) MakeVars(ctx android.MakeVarsContext) { func (l *lintSingleton) MakeVars(ctx android.MakeVarsContext) {
if !ctx.Config().UnbundledBuild() {
ctx.DistForGoal("lint-check", l.htmlZip, l.textZip, l.xmlZip) ctx.DistForGoal("lint-check", l.htmlZip, l.textZip, l.xmlZip)
}
} }
var _ android.SingletonMakeVarsProvider = (*lintSingleton)(nil) var _ android.SingletonMakeVarsProvider = (*lintSingleton)(nil)