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

Add new file name to output inputs/outputs of actions of modules into a new file when m json-module-graph is executed.

Browse Source 
And also delete the logic in droidstubs to output JSONDataActions.

Test: local.

Change-Id: Ib5d6f1f69c16c41f128e481131775c7699f96464
This commit is contained in:
kgui
2022-01-25 13:50:25 +08:00
parent c7afdefa26
commit 67007248a5
5 changed files with 17 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/droidstubs.go
View File

@@ -19,7 +19,6 @@ import (
"path/filepath"
"strings"
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
"android/soong/android"
@@ -807,8 +806,7 @@ type PrebuiltStubsSources struct {
properties PrebuiltStubsSourcesProperties
stubsSrcJar android.Path
jsonDataActions []blueprint.JSONDataAction
stubsSrcJar android.Path
}
func (p *PrebuiltStubsSources) OutputFiles(tag string) (android.Paths, error) {
@@ -824,13 +822,6 @@ func (d *PrebuiltStubsSources) StubsSrcJar() android.Path {
return d.stubsSrcJar
}
// AddJSONData is a temporary solution for droidstubs module to put action
// related data into the module json graph.
func (p *PrebuiltStubsSources) AddJSONData(d *map[string]interface{}) {
p.ModuleBase.AddJSONData(d)
(*d)["Actions"] = blueprint.FormatJSONDataActions(p.jsonDataActions)
}
func (p *PrebuiltStubsSources) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if len(p.properties.Srcs) != 1 {
ctx.PropertyErrorf("srcs", "must only specify one directory path or srcjar, contains %d paths", len(p.properties.Srcs))
@@ -838,12 +829,9 @@ func (p *PrebuiltStubsSources) GenerateAndroidBuildActions(ctx android.ModuleCon
}
src := p.properties.Srcs[0]
var jsonDataAction blueprint.JSONDataAction
if filepath.Ext(src) == ".srcjar" {
// This is a srcjar. We can use it directly.
p.stubsSrcJar = android.PathForModuleSrc(ctx, src)
jsonDataAction.Inputs = []string{src}
jsonDataAction.Outputs = []string{src}
} else {
outPath := android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"stubs.srcjar")
@@ -867,10 +855,7 @@ func (p *PrebuiltStubsSources) GenerateAndroidBuildActions(ctx android.ModuleCon
rule.Restat()
rule.Build("zip src", "Create srcjar from prebuilt source")
p.stubsSrcJar = outPath
jsonDataAction.Inputs = srcPaths.Strings()
jsonDataAction.Outputs = []string{outPath.String()}
}
p.jsonDataActions = []blueprint.JSONDataAction{jsonDataAction}
}
func (p *PrebuiltStubsSources) Prebuilt() *android.Prebuilt {