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

Commit a6ecdd39 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 82981345 44616ccd

android/module.go

+1 −0
Original line number Diff line number Diff line
@@ -1982,6 +1982,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) 
			TargetDependencies: targetRequired,

			HostDependencies:   hostRequired,

			Data:               data,

			Required:           m.RequiredModuleNames(),

		}

		SetProvider(ctx, ModuleInfoJSONProvider, m.moduleInfoJSON)

	}

android/module_info_json.go

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ type CoreModuleInfoJSON struct { 
	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))

	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 {
@@ -77,6 +78,7 @@ func encodeModuleInfoJSON(w io.Writer, moduleInfoJSON *ModuleInfoJSON) error { 
	sortAndUnique(&moduleInfoJSONCopy.core.HostDependencies)

	sortAndUnique(&moduleInfoJSONCopy.core.TargetDependencies)

	sortAndUnique(&moduleInfoJSONCopy.core.Data)

	sortAndUnique(&moduleInfoJSONCopy.core.Required)



	sortAndUnique(&moduleInfoJSONCopy.Class)

	sortAndUnique(&moduleInfoJSONCopy.Tags)