Fix toc path

toc path was including the build directory twice, which breaks builds
with absolute paths to the build directory.

Test: m -j
Bug: 26014946
Change-Id: Ibc0856d1b22a44ec0c297f5dd84a932fde9f20af
This commit is contained in:
Colin Cross 2016-10-04 09:35:23 -07:00
parent 26c34ede29
commit 4d67642cbd
1 changed files with 1 additions and 1 deletions

View File

@ -453,7 +453,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
// that is run during the build, use the library directly so
// that the timestamp of the binary changes whenever a library
// changes and any necessary tools get re-run.
tocPath := outputFile.String()
tocPath := outputFile.RelPathString()
tocPath = pathtools.ReplaceExtension(tocPath, flags.Toolchain.ShlibSuffix()[1:]+".toc")
tocFile := android.PathForOutput(ctx, tocPath)
library.tocFile = android.OptionalPathForPath(tocFile)