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

Commit 94c97905 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes from topic "soong-lint" into rvc-dev 

* changes:
  Add support for running Android lint on java and android modules.
  Consolidate adding common java properties
parents f58305a6 1e28e3c6

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

+8 −4
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)
@@ -506,15 +512,13 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) 
func AndroidLibraryFactory() android.Module {

	module := &AndroidLibrary{}



	module.Module.addHostAndDeviceProperties()

	module.AddProperties(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.aaptProperties,

		&module.androidLibraryProperties)



	module.androidLibraryProperties.BuildAAR = true

	module.Module.linter.library = true



	android.InitApexModule(module)

	InitJavaModule(module, android.DeviceSupported)

java/app.go

+9 −12
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))
@@ -970,11 +974,8 @@ func AndroidAppFactory() android.Module { 
	module.Module.properties.Instrument = true

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



	module.addHostAndDeviceProperties()

	module.AddProperties(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.aaptProperties,

		&module.appProperties,

		&module.overridableAppProperties,
@@ -1092,12 +1093,10 @@ 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(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.aaptProperties,

		&module.appProperties,

		&module.appTestProperties,
@@ -1144,12 +1143,10 @@ 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(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.aaptProperties,

		&module.appProperties,

		&module.appTestHelperAppProperties,

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

+55 −35
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
@@ -482,6 +483,22 @@ type Module struct { 
	distFile android.Path

}



func (j *Module) addHostProperties() {

	j.AddProperties(

		&j.properties,

		&j.protoProperties,

	)

}



func (j *Module) addHostAndDeviceProperties() {

	j.addHostProperties()

	j.AddProperties(

		&j.deviceProperties,

		&j.dexpreoptProperties,

		&j.linter.properties,

	)

}



func (j *Module) OutputFiles(tag string) (android.Paths, error) {

	switch tag {

	case "":
@@ -1620,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
@@ -2024,12 +2063,8 @@ var javaHeaderLibsSdkMemberType android.SdkMemberType = &librarySdkMemberType{ 
func LibraryFactory() android.Module {

	module := &Library{}



	module.AddProperties(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.libraryProperties)

	module.addHostAndDeviceProperties()

	module.AddProperties(&module.libraryProperties)



	module.initModuleAndImport(&module.ModuleBase)
@@ -2051,9 +2086,7 @@ func LibraryStaticFactory() android.Module { 
func LibraryHostFactory() android.Module {

	module := &Library{}



	module.AddProperties(

		&module.Module.properties,

		&module.Module.protoProperties)

	module.addHostProperties()



	module.Module.properties.Installable = proptools.BoolPtr(true)
@@ -2221,15 +2254,12 @@ func (p *testSdkMemberProperties) AddToPropertySet(ctx android.SdkMemberContext, 
func TestFactory() android.Module {

	module := &Test{}



	module.AddProperties(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.testProperties)

	module.addHostAndDeviceProperties()

	module.AddProperties(&module.testProperties)



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

	module.Module.dexpreopter.isTest = true

	module.Module.linter.test = true



	InitJavaModule(module, android.HostAndDeviceSupported)

	return module
@@ -2239,15 +2269,12 @@ func TestFactory() android.Module { 
func TestHelperLibraryFactory() android.Module {

	module := &TestHelperLibrary{}



	module.AddProperties(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.testHelperLibraryProperties)

	module.addHostAndDeviceProperties()

	module.AddProperties(&module.testHelperLibraryProperties)



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

	module.Module.dexpreopter.isTest = true

	module.Module.linter.test = true



	InitJavaModule(module, android.HostAndDeviceSupported)

	return module
@@ -2285,10 +2312,8 @@ func JavaTestImportFactory() android.Module { 
func TestHostFactory() android.Module {

	module := &Test{}



	module.AddProperties(

		&module.Module.properties,

		&module.Module.protoProperties,

		&module.testProperties)

	module.addHostProperties()

	module.AddProperties(&module.testProperties)



	module.Module.properties.Installable = proptools.BoolPtr(true)
@@ -2372,12 +2397,8 @@ func (j *Binary) DepsMutator(ctx android.BottomUpMutatorContext) { 
func BinaryFactory() android.Module {

	module := &Binary{}



	module.AddProperties(

		&module.Module.properties,

		&module.Module.deviceProperties,

		&module.Module.dexpreoptProperties,

		&module.Module.protoProperties,

		&module.binaryProperties)

	module.addHostAndDeviceProperties()

	module.AddProperties(&module.binaryProperties)



	module.Module.properties.Installable = proptools.BoolPtr(true)
@@ -2393,10 +2414,8 @@ func BinaryFactory() android.Module { 
func BinaryHostFactory() android.Module {

	module := &Binary{}



	module.AddProperties(

		&module.Module.properties,

		&module.Module.protoProperties,

		&module.binaryProperties)

	module.addHostProperties()

	module.AddProperties(&module.binaryProperties)



	module.Module.properties.Installable = proptools.BoolPtr(true)
@@ -2830,6 +2849,7 @@ func DefaultsFactory() android.Module { 
		&DexImportProperties{},

		&android.ApexProperties{},

		&RuntimeResourceOverlayProperties{},

		&LintProperties{},

	)



	android.InitDefaultsModule(module)