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

Merge "Dump the required modules into module-info.json" into main am: a6ecdd39c8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094443

Change-Id: I3f0b12ea8f31b338201800fbfbc025997c7199ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-20 18:03:13 +00:00
committed by Automerger Merge Worker
parent 665ece7963 a6ecdd39c8
commit 7bef057a69
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/module.go
View File

@@ -1982,6 +1982,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
TargetDependencies: targetRequired, TargetDependencies: targetRequired,
HostDependencies: hostRequired, HostDependencies: hostRequired,
Data: data, Data: data,
Required: m.RequiredModuleNames(),
} }
SetProvider(ctx, ModuleInfoJSONProvider, m.moduleInfoJSON) SetProvider(ctx, ModuleInfoJSONProvider, m.moduleInfoJSON)
} }

2
android/module_info_json.go
View File

@@ -17,6 +17,7 @@ type CoreModuleInfoJSON struct {
HostDependencies []string `json:"host_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).HOST_REQUIRED_FROM_TARGET)) HostDependencies []string `json:"host_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).HOST_REQUIRED_FROM_TARGET))
TargetDependencies []string `json:"target_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).TARGET_REQUIRED_FROM_HOST)) TargetDependencies []string `json:"target_dependencies,omitempty"` // $(sort $(ALL_MODULES.$(m).TARGET_REQUIRED_FROM_HOST))
Data []string `json:"data,omitempty"` // $(sort $(ALL_MODULES.$(m).TEST_DATA)) Data []string `json:"data,omitempty"` // $(sort $(ALL_MODULES.$(m).TEST_DATA))
Required []string `json:"required,omitempty"` // $(sort $(ALL_MODULES.$(m).REQUIRED_FROM_TARGET))
} }
type ModuleInfoJSON struct { type ModuleInfoJSON struct {
@@ -77,6 +78,7 @@ func encodeModuleInfoJSON(w io.Writer, moduleInfoJSON *ModuleInfoJSON) error {
sortAndUnique(&moduleInfoJSONCopy.core.HostDependencies) sortAndUnique(&moduleInfoJSONCopy.core.HostDependencies)
sortAndUnique(&moduleInfoJSONCopy.core.TargetDependencies) sortAndUnique(&moduleInfoJSONCopy.core.TargetDependencies)
sortAndUnique(&moduleInfoJSONCopy.core.Data) sortAndUnique(&moduleInfoJSONCopy.core.Data)
sortAndUnique(&moduleInfoJSONCopy.core.Required)
sortAndUnique(&moduleInfoJSONCopy.Class) sortAndUnique(&moduleInfoJSONCopy.Class)
sortAndUnique(&moduleInfoJSONCopy.Tags) sortAndUnique(&moduleInfoJSONCopy.Tags)