From 3ec36ad481bf6c57398e2d9a1c4b05e697c4b635 Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Fri, 29 Oct 2021 13:08:48 -0400 Subject: [PATCH] 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 --- java/base.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/java/base.go b/java/base.go index 42d7733ca..9a35675fe 100644 --- a/java/base.go +++ b/java/base.go @@ -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) }