Read ApexMkInfo for modules to be installed.
This piggybacks onto the ApexInfo cquery handler, so we're issuing a single bazel query call that reads two providers in the starlark expr. Also rename requiredDeps to makeModulesToInstall to differentiate it from APEX's required/provided libs in the apex manifest. Test: unit test Test: mkdiff Fixes: 263123189 Change-Id: Ib7e43f1586f29864eee8627dba3631bfaff27afa
This commit is contained in:
@@ -461,11 +461,6 @@ func bp2buildModuleLabel(ctx BazelConversionContext, module blueprint.Module) st
|
||||
return fmt.Sprintf("//%s:%s", moduleDir, moduleName)
|
||||
}
|
||||
|
||||
// ModuleFromBazelLabel reverses the logic in bp2buildModuleLabel
|
||||
func ModuleFromBazelLabel(label string) string {
|
||||
return strings.Split(label, ":")[1]
|
||||
}
|
||||
|
||||
// BazelOutPath is a Bazel output path compatible to be used for mixed builds within Soong/Ninja.
|
||||
type BazelOutPath struct {
|
||||
OutputPath
|
||||
|
Reference in New Issue
Block a user