diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-09-26 15:14:10 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-09-26 16:57:24 -0700 |
| commit | cba97e69ab4b9bd15e11fb67e3316d5a273fefb4 (patch) | |
| tree | ccdeff38561c5cb5dc739fa242e2623a7722e95b /python/binary.go | |
| parent | f9641687f57e09da9a00fed8e2a3a2d288c543db (diff) | |
Fix invalid memory error for python binary build
The root cause is we didn't check if the optionalpath is valid or not,
the registerbuildation function directly invoke the path var and
cause the invalid memory error. We just return if the launcher doesn't
exist.
The ctx.VisitDirectDepsWithTag() also handles allowmissingdependency so
we are ok if launcher doesn't exist.
Test: N/A
Bug: b/116698229, b/67510844
Change-Id: I40941079a64d7797ab879fc5edaa29e835b493a0
Diffstat (limited to 'python/binary.go')
| -rw-r--r-- | python/binary.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/binary.go b/python/binary.go index 4135dfef9..bf9acb411 100644 --- a/python/binary.go +++ b/python/binary.go @@ -84,15 +84,15 @@ func (binary *binaryDecorator) bootstrap(ctx android.ModuleContext, actualVersio main := binary.getPyMainFile(ctx, srcsPathMappings) - var launcherPath android.Path + var launcherPath android.OptionalPath if embeddedLauncher { ctx.VisitDirectDepsWithTag(launcherTag, func(m android.Module) { if provider, ok := m.(IntermPathProvider); ok { - if launcherPath != nil { + if launcherPath.Valid() { panic(fmt.Errorf("launcher path was found before: %q", launcherPath)) } - launcherPath = provider.IntermPathForModuleOut().Path() + launcherPath = provider.IntermPathForModuleOut() } }) } |