Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e28e3c6 authored by Colin Cross's avatar Colin Cross
Browse files

Add support for running Android lint on java and android modules. 

Add a rule that runs Android lint on each java and android module
and produces reports in xml, html and text formats.

Bug: 153485543
Test: m out/soong/.intermediates/packages/apps/Settings/Settings-core/android_common/lint-report.html
Change-Id: I5a530975b73ba767fef45b257d4f9ec901a19fcb
Merged-In: I5a530975b73ba767fef45b257d4f9ec901a19fcb
(cherry picked from commit 014489c1)
parent 1c14b4ec

java/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ bootstrap_go_package { 
        "jdeps.go",

        "java_resources.go",

        "kotlin.go",

        "lint.go",

        "platform_compat_config.go",

        "plugin.go",

        "prebuilt_apis.go",

java/aar.go

+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ type aapt struct { 
	sdkLibraries            []string

	hasNoCode               bool

	LoggingParent           string

	resourceFiles           android.Paths



	splitNames []string

	splits     []split
@@ -275,6 +276,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex 


	var compiledResDirs []android.Paths

	for _, dir := range resDirs {

		a.resourceFiles = append(a.resourceFiles, dir.files...)

		compiledResDirs = append(compiledResDirs, aapt2Compile(ctx, dir.dir, dir.files, compileFlags).Paths())

	}
@@ -473,6 +475,10 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) 
	// apps manifests are handled by aapt, don't let Module see them

	a.properties.Manifest = nil



	a.linter.mergedManifest = a.aapt.mergedManifestFile

	a.linter.manifest = a.aapt.manifestPath

	a.linter.resources = a.aapt.resourceFiles



	a.Module.extraProguardFlagFiles = append(a.Module.extraProguardFlagFiles,

		a.proguardOptionsFile)
@@ -512,6 +518,7 @@ func AndroidLibraryFactory() android.Module { 
		&module.androidLibraryProperties)



	module.androidLibraryProperties.BuildAAR = true

	module.Module.linter.library = true



	android.InitApexModule(module)

	InitJavaModule(module, android.DeviceSupported)

java/app.go

+6 −0
Original line number Diff line number Diff line
@@ -737,6 +737,10 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 


	a.proguardBuildActions(ctx)



	a.linter.mergedManifest = a.aapt.mergedManifestFile

	a.linter.manifest = a.aapt.manifestPath

	a.linter.resources = a.aapt.resourceFiles



	dexJarFile := a.dexBuildActions(ctx)



	jniLibs, certificateDeps := collectAppDeps(ctx, a, a.shouldEmbedJnis(ctx), !Bool(a.appProperties.Jni_uses_platform_apis))
@@ -1089,6 +1093,7 @@ func AndroidTestFactory() android.Module { 
	module.appProperties.Use_embedded_native_libs = proptools.BoolPtr(true)

	module.appProperties.AlwaysPackageNativeLibs = true

	module.Module.dexpreopter.isTest = true

	module.Module.linter.test = true



	module.addHostAndDeviceProperties()

	module.AddProperties(
@@ -1138,6 +1143,7 @@ func AndroidTestHelperAppFactory() android.Module { 
	module.appProperties.Use_embedded_native_libs = proptools.BoolPtr(true)

	module.appProperties.AlwaysPackageNativeLibs = true

	module.Module.dexpreopter.isTest = true

	module.Module.linter.test = true



	module.addHostAndDeviceProperties()

	module.AddProperties(

java/droiddoc.go

+15 −0
Original line number Diff line number Diff line
@@ -1224,6 +1224,21 @@ func DroidstubsHostFactory() android.Module { 
	return module

}



func (d *Droidstubs) OutputFiles(tag string) (android.Paths, error) {

	switch tag {

	case "":

		return android.Paths{d.stubsSrcJar}, nil

	case ".docs.zip":

		return android.Paths{d.docZip}, nil

	case ".annotations.zip":

		return android.Paths{d.annotationsZip}, nil

	case ".api_versions.xml":

		return android.Paths{d.apiVersionsXml}, nil

	default:

		return nil, fmt.Errorf("unsupported module reference tag %q", tag)

	}

}



func (d *Droidstubs) ApiFilePath() android.Path {

	return d.apiFilePath

}

java/java.go

+27 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ type Module struct { 


	hiddenAPI

	dexpreopter

	linter



	// list of the xref extraction files

	kytheFiles android.Paths
@@ -494,6 +495,7 @@ func (j *Module) addHostAndDeviceProperties() { 
	j.AddProperties(

		&j.deviceProperties,

		&j.dexpreoptProperties,

		&j.linter.properties,

	)

}
@@ -1635,6 +1637,28 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
		outputFile = implementationAndResourcesJar

	}



	if ctx.Device() {

		lintSDKVersionString := func(sdkSpec sdkSpec) string {

			if v := sdkSpec.version; v.isNumbered() {

				return v.String()

			} else {

				return ctx.Config().DefaultAppTargetSdk()

			}

		}



		j.linter.name = ctx.ModuleName()

		j.linter.srcs = srcFiles

		j.linter.srcJars = srcJars

		j.linter.classpath = append(append(android.Paths(nil), flags.bootClasspath...), flags.classpath...)

		j.linter.classes = j.implementationJarFile

		j.linter.minSdkVersion = lintSDKVersionString(j.minSdkVersion())

		j.linter.targetSdkVersion = lintSDKVersionString(j.targetSdkVersion())

		j.linter.compileSdkVersion = lintSDKVersionString(j.sdkVersion())

		j.linter.javaLanguageLevel = flags.javaVersion.String()

		j.linter.kotlinLanguageLevel = "1.3"

		j.linter.lint(ctx)

	}



	ctx.CheckbuildFile(outputFile)



	// Save the output file with no relative path so that it doesn't end up in a subdirectory when used as a resource
@@ -2235,6 +2259,7 @@ func TestFactory() android.Module { 


	module.Module.properties.Installable = proptools.BoolPtr(true)

	module.Module.dexpreopter.isTest = true

	module.Module.linter.test = true



	InitJavaModule(module, android.HostAndDeviceSupported)

	return module
@@ -2249,6 +2274,7 @@ func TestHelperLibraryFactory() android.Module { 


	module.Module.properties.Installable = proptools.BoolPtr(true)

	module.Module.dexpreopter.isTest = true

	module.Module.linter.test = true



	InitJavaModule(module, android.HostAndDeviceSupported)

	return module
@@ -2823,6 +2849,7 @@ func DefaultsFactory() android.Module { 
		&DexImportProperties{},

		&android.ApexProperties{},

		&RuntimeResourceOverlayProperties{},

		&LintProperties{},

	)



	android.InitDefaultsModule(module)