From e0070ee3134f46139b5b8e0f30b43c78144724b2 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Mon, 22 Jun 2020 11:52:59 -0700 Subject: [PATCH] Implement OutputFiles for python modules. This enables python binaries to be included in data properties with the format ":module". Test: m FirmwareDtboVerification with local changes Bug: 153848038 Change-Id: I2a02dc382fcbb142d8e4fbdbb6ca461986627d25 --- python/python.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/python/python.go b/python/python.go index 8b912be17..a6c9e2a07 100644 --- a/python/python.go +++ b/python/python.go @@ -251,6 +251,18 @@ func (p *Module) HostToolPath() android.OptionalPath { return android.OptionalPathForPath(p.installer.(*binaryDecorator).path) } +func (p *Module) OutputFiles(tag string) (android.Paths, error) { + switch tag { + case "": + if outputFile := p.installSource; outputFile.Valid() { + return android.Paths{outputFile.Path()}, nil + } + return android.Paths{}, nil + default: + return nil, fmt.Errorf("unsupported module reference tag %q", tag) + } +} + func (p *Module) isEmbeddedLauncherEnabled(actual_version string) bool { switch actual_version { case pyVersion2: