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

Commit 3ec36ad4 authored by Romain Jobredeaux's avatar Romain Jobredeaux
Browse files

Add source extension information for java_*/android_* modules in module-graph.json. 

Change-Id: I400542e1ab7a19a3a3ad7df95cae15475eaf9527
Bug: 198224074
Test: ./build/bazel/scripts/bp2build-progress/bp2build-module-dep-infos.py --module_type android_app > ~/all_app_trans_dep_no_framework.txt
parent 104ecf67

java/base.go

+16 −0
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ type Module struct { 
	sdkVersion    android.SdkSpec

	minSdkVersion android.SdkSpec

	maxSdkVersion android.SdkSpec



	sourceExtensions []string

}



func (j *Module) CheckStableSdkVersion(ctx android.BaseModuleContext) error {
@@ -959,6 +961,14 @@ func (j *Module) collectJavacFlags( 
	return flags

}



func (j *Module) AddJSONData(d *map[string]interface{}) {

	(&j.ModuleBase).AddJSONData(d)

	(*d)["Java"] = map[string]interface{}{

		"SourceExtensions": j.sourceExtensions,

	}



}



func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {

	j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.deviceProperties.Aidl.Export_include_dirs)
@@ -970,6 +980,12 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
	}



	srcFiles := android.PathsForModuleSrcExcludes(ctx, j.properties.Srcs, j.properties.Exclude_srcs)

	j.sourceExtensions = []string{}

	for _, ext := range []string{".kt", ".proto", ".aidl", ".java", ".logtags"} {

		if hasSrcExt(srcFiles.Strings(), ext) {

			j.sourceExtensions = append(j.sourceExtensions, ext)

		}

	}

	if hasSrcExt(srcFiles.Strings(), ".proto") {

		flags = protoFlags(ctx, &j.properties, &j.protoProperties, flags)

	}