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

Merge "Add module based host-tools snapshot"

Browse Source
This commit is contained in:
Rob Seymour
2021-09-14 14:47:03 +00:00
committed by Gerrit Code Review
parent 04e0a1551d 925aa09ea1
commit f6c37cc87d
15 changed files with 642 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
python/python.go
View File

@@ -310,13 +310,16 @@ func versionSplitMutator() func(android.BottomUpMutatorContext) {
// HostToolPath returns a path if appropriate such that this module can be used as a host tool,
// fulfilling HostToolProvider interface.
func (p *Module) HostToolPath() android.OptionalPath {
if p.installer == nil {
// python_library is just meta module, and doesn't have any installer.
return android.OptionalPath{}
if p.installer != nil {
if bin, ok := p.installer.(*binaryDecorator); ok {
// TODO: This should only be set when building host binaries -- tests built for device would be
// setting this incorrectly.
return android.OptionalPathForPath(bin.path)
}
}
// TODO: This should only be set when building host binaries -- tests built for device would be
// setting this incorrectly.
return android.OptionalPathForPath(p.installer.(*binaryDecorator).path)
return android.OptionalPath{}
}
// OutputFiles returns output files based on given tag, returns an error if tag is unsupported.